Merge "Clean up and bug fixes in the TouchExplorer."