review import, fix indexes and use of raw types