incorporated latest 2C edits, fixed one mrow in 4C #26

Closed ladanielson closed 8 years ago