Touch events now working properly