touch events are now working properly
fixed merge conflicts