Fixed potentially errored condition.
Fixed movement numbers in non interactive mode.