Fix/clarify a few minor things.