Fixed movement problem and return problem