Move debug code and touch comparisons