fix import loop, add set to types, and fix comments