adding man, edit --header, bug fixes