(finally) normalized almost everything, added dispatchers for calibration start/end