improvements to touch mode