edited crap out of actions and common files