Add basic storage to file. Fix typos.

Change-Id: I18ecd1ddfc688bd55b3c55dcd2338ca9baa0a259