Fixed movement

movement fixed (and added android code)