Storage tweaks

A number of enhancements around storage data format and logging - still in progress