Resolved potential issue where a first run scenario may have no data by default.  Also made sure that upon save, data is committed to disk.