some fix and reduction of import