Added new options to the settings file and dialog.
Added more unit testing.