-Finished last of the fixing

Note: Sub-item saving in config tool is currently broken