Maintenance: reenabled fit plotting, other stuff
Updated analysis of calibration