finally solved 2nd calibration issue! close #126, also resolved issue with sreyanth matching code wrt calibration, close #221