fix imports and command line args;