fixed a few things and made it ready to merge with master(commented out the movements to be compatible with different scenes)