fix imports, add debug