Bugfixes

Should be working on touch devices now.