Fixed bug in final calibration loop.
Removed hard coded limit on number of clovers which was left in from debugging.