Updates and final revisions for 2.0 release