Squashing previous corrections into one commit along with a couple more
corrections to the docs