Diagnostics updates for 4/25

Re-write of two diagnostics articles