A bunch of additions and updates to marcframe.json