Fix/124

A bit of housekeeping, plus tweaking logging to be cleaner for non-debug, more verbose with debug enabled.