Updates/fixes after discussion with Keith Smith

cf @timj, @nxg, Michael Williams and Keith Smith email thread of 2013 September 5