smooth cursoring enabled + calibration set up
fixed merge conflicts