Minor documentation updates
Undid last merge with master