Movement and Phasing fixes

Fixed flickering
Fixed movement collisions.