More work on docs, and some class renaming.