Made a few changes to touch events