Diag changes
Comments, tidy up