Code slightly formatted
Fixed minor bugs
Fixed movement (clean now)
Collision is ok, as well