more work on special moves and file cleanup