Stage calibration, improved class structure.