cleans up long move logic
tweaks some constants