fix import and update upgrade steps
fix typo
fix hopefully indexers