fixes for touch events
Merge pull request #431 from waterbearlang/298_touch_events_broken

fixes for touch events