diff --git a/README.md b/README.md
index e589bb6..eff1d8b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-Cordova for WP7 Mango
+Apache Cordova for Windows Phone 7
 ===
 
-Cordova WP7 is a .net application library that lets you create Cordova applications targeting WP7 Mango devices.
-Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
+Apache Cordova WP7 is a .net application library that lets you create Apache Cordova applications targeting Windows Phone 7 devices.
+Apache Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
 
 Requires
 ---
@@ -13,7 +13,7 @@
 Getting Started
 ---
 
-- copy the file CordovaStarter-x.x.x.zip to the folder : \My Documents\Visual Studio 2010\Templates\ProjectTemplates\
+- copy the file templates/CordovaStarter-x.x.x.zip to the folder : \My Documents\Visual Studio 2010\Templates\ProjectTemplates\
  - if you have just installed VisualStudio, you should launch it once to create this folder
  - if you prefer, you may add the project instead to the "Silverlight for Windows Phone" subfolder of "Visual C#".  This is up to you, and only affects where the project template is shown when creating a new project. Also, You may need to create this folder.
 - Launch Visual Studio 2010 and select to create a new project
@@ -25,19 +25,16 @@
 Important!!!
 ---
 
-When you add or remove files/folders in the www folder you will need to do the following
+When you add or remove files/folders in the www folder you will need to do the following :
 
 - ensure the new item is included in the project ( Content ) This includes ALL images/css/html/js/* and anything that you want available at runtime.
 - Do not modify the CordovaSourceDictionary.xml file which is included in the project, it is auto-generated for you when you build.
 
-Known Issues
+Known Problem Areas
 ---
 
-You cannot deploy (and thus debug) the framework if you want to make use
-of various Media features by default (like taking a picture, capturing
-audio, etc.). This is because the Zune software
-locks the media library and somehow that affects your device. For a
-workaround, please check out this [MSDN blog article](http://blogs.msdn.com/b/jaimer/archive/2010/11/03/tips-for-debugging-wp7-media-apps-with-wpconnect.aspx).
+Many of the Media APIs will not function as expected when debugging while connect to the device with the Zune software.
+To get around this, you need to use the Windows Phone Connect tool. For details, please check out this [MSDN blog article](http://blogs.msdn.com/b/jaimer/archive/2010/11/03/tips-for-debugging-wp7-media-apps-with-wpconnect.aspx).
 
 
 BUGS?
diff --git a/framework/Properties/AssemblyInfo.cs b/framework/Properties/AssemblyInfo.cs
index ea72938..40b5794 100644
--- a/framework/Properties/AssemblyInfo.cs
+++ b/framework/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("WP7CordovaClassLib")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("2.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Cordova")]
 [assembly: AssemblyProduct("WP7CordovaClassLib")]
diff --git a/templates/CordovaStarter-2.0.0.zip b/templates/CordovaStarter-2.0.0.zip
new file mode 100644
index 0000000..5f42b95
--- /dev/null
+++ b/templates/CordovaStarter-2.0.0.zip
Binary files differ
diff --git a/templates/description.txt b/templates/description.txt
index 1582b22..8340586 100644
--- a/templates/description.txt
+++ b/templates/description.txt
@@ -1,4 +1,4 @@
 CordovaStarter
 
-Starter project for building a Cordova app for Windows Phone version: 1.9.0 ( formerly PhoneGap )
+Starter project for building a Cordova app for Windows Phone version: 2.0.0 ( formerly PhoneGap )
 
diff --git a/templates/full/CordovaLib/WP7CordovaClassLib.dll b/templates/full/CordovaLib/WP7CordovaClassLib.dll
index 77a4264..79c534f 100644
--- a/templates/full/CordovaLib/WP7CordovaClassLib.dll
+++ b/templates/full/CordovaLib/WP7CordovaClassLib.dll
Binary files differ