Added storage. Bug fixes
Merge