fix typo
fix typo and merge storage branch