Various doc cleanups, and a few items removed from TODO
2 files changed