Added touch / mouse support
Debugging