Improve touch sensing
Tweaks