fixed state change, added physics arcade
fixed merge conflicts