Did a bunch of work on diagnostics etc