Cleaned up settings xml and added settings object.