clean up, next experiments, and adjusting calibration code