Rollup of changes to v2.0

Changes/bug fixes. Starting versioning at 2.0.