Fixed some typos and little mistakes.

I'm making tests run.  So far there's lots of errors and I have no
idea if I caused them.  I'll be fixing 'em soon.