imports, some minor fixes