Lots more changes from the docs. Still a couple to go. Then cleanup.