Typo.
Assorted bugfixes.