Misc type-o fixes and minor formatting.