fixed stupidity with touch events
fixed forgotten merge conflict that didn't break anything