Fixed movement and added basic collisions