Miscellaneous cleanup and fixed POD errors.