Updated man files and tweaked source code