Better command line logging 

Mostly fixes issues #7 & #8.