simplified & fixed occasional 'stuck' state
Merge branch 'touches'