Miscellaneous Fixes and Enhancements. This release addresses a few issues which cropped up in the initial 2.0 release.