Calibration validation, Error count badge, refactoring, fixes