clean up logging more, import cleanup

accidentally set the log name key to the thread name key
did some cleanup