fixed touch

removed the timer hack

and put in touch detection.

fixes events that fire twice due to touch being enabled.