Added calibration; smooth out movement