Ran 2.1 through the grinder and cleaned up various undefined variable notices.

Also, added "settings saved" message when saving options from System Status -> Tools.