Added touch enhancements and fixed some visualization bugs