Bug 1077510 1077513 1077587 - Cleanup man page and logging