added force calibration option and did a little clean up