Updated touch code a bit.