Added movement other fixes