Various changes to improve calib run reliability and increase threshold etc