add pre-calibration metric and summary column for heatmap; minor fixes;