log output cleanup.
minor fixes.
updated version to 0.6.1
Merge branch 'release/0.6.1'