Added better output and more man pages