fixed: bug with default value '!isTouch'

+ various code improvements