Some work complete of prefs.
Some cleanup and renaming. Starting to put a button on HT.