- Touch is finally working!
- Reformatted the code a bit, hope I don't break anything ;)