Bug fixes for 2.1 release.  Documentation improvements. (2)