Clean up touchstone, update fixes.