A bit more clean up, and some trace information for events
happy formatting changes