Fixups and more documentation.