1/ Cleaned up many things
2/ Now loading calibration data