no empty names and fixed import dups