Add some comments and changed settings name