fix imports and some other small things