changes to m3 and attempted fixes to m2
merged