more verbose output, extracted functions

I'm going to push this to the server, please review @chrislea 
tested with Debian & Mint