Cleanup; now moves in circle

Still doesn't work after 6 or 7 mouse clicks and 6 or 7 key presses