tweak touchpoint labels, change comment style