Minor changes. Fixed save config, working on config restore