Marked OQuaRE mtl to move, added some other annotations

Apparently not narrow enough to enable auto-merge. Can do manual merge, but can hold back for now if disruptive.