Some physics changes, added calibration, added settings