cleaned log output, fixed #89, #88, #87
fix #86
clean up log output, code cleanup