Issue 10: cleanup client side logging
fix more client logging stuff