DiagnosisControllers and some bug fixes