cleaned up some JS and added touch events