[Nsi-wg] edits for v 0.8