added cutting the mustard,
refactoring
clean up touch support