fixed all store bugs