Some more edits to upgrade docs