- Improved touch support.
- Minor cleanup.