NXML changes, and spelling.