Smaller changes, mostly doc.