Diagnostics refactor

-added additional timer diagnostic wrappers for benchmarking to identify
bottlenecks and potentially parallelizable units of work.
-cleaned up formatting and revised comments for clarification