Movement redo: xbox support & cleaning