Some more work done on MP stuff.