Logging Improvements

Some simple logging improvements. Also address #13