CLN: more imports, highlighting