added calibrated predictive model builder factory...now need to test
added fixes, cleaning,  and TODO's to the calibrator