Merged Alex's changes and generated new man pages.