diff --git a/README.md b/README.md
index a2cbf31b..c40e887d 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,18 @@
 This project contains command line scripts for package creation and image creation process. Users are expected to have ADK and WDK installed to make use of this. In addition, this project also contains samples for iot products based on RPi2/MBM. To be able to create images, Users should get IoTCore OS Packages from MSDN. Target audience is OEM’s and Maker Pro’s who want to manage multiple images and updates.
 
 This project has adopted the [Microsoft Open Source Code of Conduct](http://microsoft.github.io/codeofconduct). For more information see the [Code of Conduct FAQ](http://microsoft.github.io/codeofconduct/faq.md) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+#Branch Overview
+
+##Master Branch
+This branch supports the lastest windows IoTCore release available ( currently 1511, version number 10.0.10586.x )
+
+##Develop Branch
+This branch contains the active development contents, mostly addressing the upcoming release features. Currently this supports Windows IoTCore 1607 update.
+
+##10586 Branch
+This branch supports the Windows IoT Core Release 1511.
+
+
+
+
diff --git a/Tools/BuildKitAgent.cmd b/Tools/BuildKitAgent.cmd
index ee3d99ed..f044604f 100644
--- a/Tools/BuildKitAgent.cmd
+++ b/Tools/BuildKitAgent.cmd
@@ -1,15 +1,17 @@
-REM This script builds FFUs for all OEMInputSamples in Core Kit package
-
 @echo off
 
+REM This script builds FFUs for all OEMInputSamples in Core Kit package
+
 call %~dp0\LaunchTool.cmd arm
 
 REM call setenv arm
 echo Building arm sample FFUs
-call BuildKitSamples.cmd
+call BuildKitSamples.cmd Test
+call BuildKitSamples.cmd Retail
 
 call setenv x86
 echo Building x86 sample FFUs
-call BuildKitSamples.cmd
+call BuildKitSamples.cmd Test
+call BuildKitSamples.cmd Retail
 
 exit /b 0
diff --git a/Tools/BuildKitSamples.cmd b/Tools/BuildKitSamples.cmd
index d5db7840..69e76c2f 100644
--- a/Tools/BuildKitSamples.cmd
+++ b/Tools/BuildKitSamples.cmd
@@ -1,22 +1,36 @@
-REM This script builds architecture specific FFUs for OEMInputSamples in Core Kit package
-REM Usage: BuildKitSamples [BuildType]
-REM    BuildType......... Optional, Retail/Test; if not specified, it builds both Retail and Test
-REM    Example:
-REM        BuildKitSamples Test
-REM        BuildKitSamples Retail
-REM        BuildKitSamples 
-
 @echo off
+REM This script builds architecture specific FFUs for OEMInputSamples in Core Kit package
 setlocal
+
+goto START
+
+:Usage
+echo Usage: BuildKitSamples [BuildType]
+echo    BuildType.........  Retail/Test 
+echo    Example:
+echo        BuildKitSamples Test
+echo        BuildKitSamples Retail
+
+exit /b 1
+
+:START
+REM Input validation
+if [%1] == [/?] goto Usage
+if [%1] == [-?] goto Usage
+if [%1] == [] goto Usage
+
+if /I NOT [%1] == [Retail] ( if /I NOT [%1] == [Test] goto Usage  )
 set FLAVOUR=%1
-if /I NOT [%1] == [Retail] ( if /I NOT [%1] == [Test] set FLAVOUR=  )
+
 echo.
 echo.Build Start Time : %TIME%
 echo.
 
 if [%ARCH%] == [arm] (
+	echo Building RPi2 product 
 	call :COPY_AND_BUILD RPi2 %FLAVOUR%
 ) else if [%ARCH%] == [x86] (
+	echo Building MBM product
 	call :COPY_AND_BUILD MBM %FLAVOUR%
 )
 
@@ -33,8 +47,8 @@ if not exist "%PRODUCT_DIR%" (
 	mkdir "%PRODUCT_DIR%"
 )
 echo.Copying %1 OEMInputSamples to %PRODUCT_DIR%
-copy "%KITSROOT%OEMInputSamples\%1\RetailOemInput.xml" "%PRODUCT_DIR%\RetailOemInput.xml" >nul
-copy "%KITSROOT%OEMInputSamples\%1\ProductionOemInput.xml" "%PRODUCT_DIR%\TestOemInput.xml" >nul
+copy "%KITSROOT%OEMInputSamples\%BSP_ARCH%\%1\RetailOemInput.xml" "%PRODUCT_DIR%\RetailOemInput.xml" >nul
+copy "%KITSROOT%OEMInputSamples\%BSP_ARCH%\%1\ProductionOemInput.xml" "%PRODUCT_DIR%\TestOemInput.xml" >nul
 echo.Building %1FFU %2
 call buildimage %1FFU %2
 exit /b 0