fixed imports, and MCP patch line normalizing