MC-44: Typo, CS, doc, comments