fix for compatibility with 2.0.0; general cleanups
version bump; docs updated