Doc changes and minor bugfix with DataStorage
Added documentation and tests