Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
Small tweaks to the mcp data. Nothing major..