Clean up and add a bit to manpage