Cleaning up some of the definitions, sorry if makes awful conflicts

also motionbehaviors don't work on powerups and I don't know why and I
give up for tonight