Final batch of NR's comment applied. Needs another read.