Added new functions and clean up manpages