A little clean up and fixes on the touches management.