Store improvements

More changes to store.  The storage manager builds on these.