tidied up code slightly. Also removed some transient fields fromt the info files before persisting