Tried to get setting restoration fixed; a little more modular, but not quite totally debugged yet... :P