Revert
Added automatic calibration
made calibrator work globally
Small tweaks (note to self: spell correctly)