diff --git a/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs b/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
index afdc47e4df63..843b572dbc50 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Globalization;
 using System.Management.Automation;
 using System.Security.Permissions;
 using Microsoft.WindowsAzure.Commands.Common;
@@ -346,7 +347,14 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden
             }
             else
             {
-                azureEnvironment = DefaultProfileClient.GetEnvironmentOrDefault(azureEnvironmentName);
+                try
+                {
+                    azureEnvironment = DefaultProfileClient.GetEnvironmentOrDefault(azureEnvironmentName);
+                }
+                catch (ArgumentException e)
+                {
+                    throw new ArgumentException(e.Message + " " + string.Format(CultureInfo.CurrentCulture, Resources.ValidEnvironmentName, EnvironmentName.AzureCloud, EnvironmentName.AzureChinaCloud)); 
+                }
             }
 
             Uri blobEndPoint = azureEnvironment.GetStorageBlobEndpoint(storageAccountName, useHttps);
diff --git a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs
index 5c33be8d398f..2497168bddf5 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs
@@ -50,6 +50,7 @@ public class NewAzureStorageDirectory : AzureStorageFileCmdletBase
         [Parameter(
             Position = 1,
             Mandatory = true,
+            ValueFromPipeline = true,
             HelpMessage = "Path of the directory to be created.")]
         [ValidateNotNullOrEmpty]
         public string Path { get; set; }
diff --git a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs
index 43b658ddd229..f932ee115ea5 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs
@@ -22,6 +22,7 @@ public class NewAzureStorageShare : AzureStorageFileCmdletBase
         [Parameter(
             Position = 0,
             Mandatory = true,
+            ValueFromPipeline = true,
             HelpMessage = "Name of the file share to be created.")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
diff --git a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs
index d3905c228c3e..0e56d2600e02 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs
@@ -64,6 +64,7 @@ public class RemoveAzureStorageDirectory : AzureStorageFileCmdletBase
             HelpMessage = "Path to the directory to be removed.")]
         [Parameter(
             Position = 1,
+            ValueFromPipeline = true,
             ParameterSetName = Constants.DirectoryParameterSetName,
             HelpMessage = "Path to the directory to be removed.")]
         [ValidateNotNullOrEmpty]
diff --git a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs
index d9e46a61c4e7..eab3e00f0bb4 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs
@@ -29,6 +29,7 @@ public class RemoveAzureStorageShare : AzureStorageFileCmdletBase
         [Parameter(
             Position = 0,
             Mandatory = true,
+            ValueFromPipeline = true,
             ParameterSetName = Constants.ShareNameParameterSetName,
             HelpMessage = "Name of the file share to be removed.")]
         [ValidateNotNullOrEmpty]
diff --git a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs
index 1e992e04a0dc..545d610be675 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs
@@ -52,9 +52,11 @@ public class SetAzureStorageFileContent : StorageFileDataManagementCmdletBase
         [ValidateNotNull]
         public CloudFileDirectory Directory { get; set; }
 
+        [Alias("FullName")]
         [Parameter(
             Position = 1,
             Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Path to the local file to be uploaded.")]
         [ValidateNotNullOrEmpty]
         public string Source { get; set; }
diff --git a/src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml b/src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml
index 1d36c9737074..c57a26264ae2 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml
+++ b/src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml
@@ -2643,7 +2643,7 @@ echo &quot;Total $total containers&quot;</dev:code>
 			<maml:introduction>
 				<maml:para></maml:para>
 			</maml:introduction>
-			<dev:code>PS C:\&gt; Get-AzureStorageFileContent -FileShareName sample -FilePath sampledir/samplefile</dev:code>
+			<dev:code>PS C:\&gt; Get-AzureStorageFileContent -ShareName sample -FilePath sampledir/samplefile</dev:code>
 			<dev:remarks>
 				<maml:para>This example downloads the file whose path is sampledir/samplefile in the sample file share.</maml:para>
 			</dev:remarks>
@@ -3039,6 +3039,9 @@ echo &quot;Total $total containers&quot;</dev:code>
 		</command:example>
 	</command:examples>
 	<maml:relatedLinks>
+    <maml:navigationLink>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806375.aspx</maml:uri>
+    </maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@@ -3209,6 +3212,9 @@ echo &quot;Total $total containers&quot;</dev:code>
 		</command:example>
 	</command:examples>
 	<maml:relatedLinks>
+    <maml:navigationLink>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806390.aspx</maml:uri>
+    </maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@@ -4125,8 +4131,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
 	</command:examples>
 	<maml:relatedLinks>
 		<maml:navigationLink>
-			<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
-			<maml:uri></maml:uri>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806412.aspx</maml:uri>
 		</maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
@@ -4649,8 +4654,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
 	</command:examples>
 	<maml:relatedLinks>
 		<maml:navigationLink>
-			<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
-			<maml:uri></maml:uri>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806416.aspx</maml:uri>
 		</maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
@@ -4956,7 +4960,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
 				<maml:name>String</maml:name>
 				<maml:uri/>
 			</dev:type>
-			<dev:defaultValue></dev:defaultValue>
+			<dev:defaultValue>AzureCloud | AzureChinaCloud</dev:defaultValue>
 		</command:parameter>
 		<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="false" position="named">
 			<maml:name>ConnectionString</maml:name>
@@ -6041,8 +6045,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
 	</command:examples>
 	<maml:relatedLinks>
 		<maml:navigationLink>
-			<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
-			<maml:uri></maml:uri>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806410.aspx</maml:uri>
 		</maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
@@ -6893,8 +6896,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
 	</command:examples>
 	<maml:relatedLinks>
 		<maml:navigationLink>
-			<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
-			<maml:uri></maml:uri>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806400.aspx</maml:uri>
 		</maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
@@ -9482,7 +9484,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
 			<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue, ByPropertyName)" position="0">
 				<maml:name>Name</maml:name>
 				<maml:description>
-					<maml:para></maml:para>
+					<maml:para>The name of the table to be removed.</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			</command:parameter>
@@ -9527,7 +9529,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
 		<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue, ByPropertyName)" position="0">
 			<maml:name>Name</maml:name>
 			<maml:description>
-				<maml:para></maml:para>
+				<maml:para>The name of the table to be removed.</maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			<dev:type>
@@ -11368,6 +11370,9 @@ Set-AzureStorageBlobContent -File filename -Container containername -Metadata $m
 		</command:example>
 	</command:examples>
 	<maml:relatedLinks>
+    <maml:navigationLink>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806397.aspx</maml:uri>
+    </maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@@ -11614,6 +11619,9 @@ Set-AzureStorageBlobContent -File filename -Container containername -Metadata $m
 		</command:example>
 	</command:examples>
 	<maml:relatedLinks>
+    <maml:navigationLink>
+      <maml:uri>http://msdn.microsoft.com/en-us/library/dn806391.aspx</maml:uri>
+    </maml:navigationLink>
 	</maml:relatedLinks>
 </command:command>
 <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
diff --git a/src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs b/src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs
index 6b771c0a10a0..54664d9182dc 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs
+++ b/src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs
@@ -1459,6 +1459,15 @@ internal static string UseStorageAccountFromContext {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Valid environment names are: &apos;{0}&apos; and &apos;{1}&apos;.
+        /// </summary>
+        internal static string ValidEnvironmentName {
+            get {
+                return ResourceManager.GetString("ValidEnvironmentName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} {1}..
         /// </summary>
diff --git a/src/ServiceManagement/Storage/Commands.Storage/Resources.resx b/src/ServiceManagement/Storage/Commands.Storage/Resources.resx
index 0e11042c4d4f..d7e24e14b87b 100644
--- a/src/ServiceManagement/Storage/Commands.Storage/Resources.resx
+++ b/src/ServiceManagement/Storage/Commands.Storage/Resources.resx
@@ -661,4 +661,8 @@ Failed: {2}.</value>
   <data name="TransmitCancelled" xml:space="preserve">
     <value>Transmit cancelled by user.</value>
   </data>
+  <data name="ValidEnvironmentName" xml:space="preserve">
+    <value>Valid environment names are: '{0}' and '{1}'</value>
+    <comment>0 and 1 are for the correct Environment names</comment>
+  </data>
 </root>
\ No newline at end of file