Touch update

Fixed a better touch event handler