Add dual touch/mouse support, plus other bug fixes