Fixed movement bug.
Optimizing.