Added a number of small Diagnose features