Updated the type code, narrative and original text, and the comments