Cleanup and small fixes.

Currently contains some comment & error message typo corrections.