Some updates

Fix storage!