fixed behaviors and master movement