Updated listeners again. Hopefully this will make touch events work. Last commit was ineffective.