Fix command names
Integrate rough calibration model