upgrades and preparing for 2.0 release