Touch events now properly handled