Merge "Some hygiene for the touch explorer." into klp-dev