update storages and fix bugs