1.6.2 port

I didn't know the new MCP mapping for a few things. Seems to work fine. See notes on commit.