Minor changes to make the diagnostics more user-friendly. Removed old diagnostics. Added measurement of time consumed by each diagnostic class