updates for m3

@mythz all a few of the test collections are failing, just did a quick rundown with the clean up tool, this might require a lot more work to get things functional again. Can you take a look?