More cleanup, especially docs.