Some typos, better output format more calibration output