All done except multi-touch bug

last save before cleaning up code