Settings module now commits changes to XML file + minor bug fixes