Added four-point calibration
Integrated calibration into experiment2
Small fixes and shit