Added dep for commonmod on mtargs and tidied up a bit