Fixed movement and collisions. FINALLY