fixes

broke movement with conflicting variable after merging movement class.
Fixed now.