Small adjustments; version 2.0.6 release.