more imports and fixes