heat maps and bug fixes. Calibration is almost done