minor code and man page cleanup
tagged 3.3.0