Fixed movement and minor code improvements. Now with comments