More doc bits and cleaning up.