Update to Ina's proposed -05.
Various small editorial fixes