Revert "Revert "lots more touchstart catches""

This reverts commit 4da352bd39d3f65355a3b51a91647a1815b34f8c.