Fix (mostly) over-turning, and add square drive

Now David can see how to use the code, which works better.