Bump to 2.0.0; misc library upgrades