Tweaked class diagrams
Closes #347

Make sure logging is adequate and explanatory when using debug level