field fixes and more storage logic