Moar bugfix

Typos are bad. More bugfixes might come flooding in because I'm reading
over my code, and testing it.