make GUID optional, add saving comments