Added basic move verification.
Cleanup, comments