Added Diagnostics, moved Scale to SolverDiagnostics, updated formatting
of output.