Logging + Misc cleanup

Consider migrating to levelled logs via glog?