improved importer and normalizer. added build dict