Various fixes and v2.0 release.