A few corrections from @nicholsonjf