overall updates for 2.0 release