Fix input-getting bug.

Bug result of poorly-done merge.
Fix move validation.