diff --git a/LinqToUmbraco/src/umbraco.Linq/Core/umbraco.Linq.Core.csproj b/LinqToUmbraco/src/umbraco.Linq/Core/umbraco.Linq.Core.csproj
index 23653137dd..290f1b91ff 100644
--- a/LinqToUmbraco/src/umbraco.Linq/Core/umbraco.Linq.Core.csproj
+++ b/LinqToUmbraco/src/umbraco.Linq/Core/umbraco.Linq.Core.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>umbraco.Linq.Core</RootNamespace>
     <AssemblyName>umbraco.Linq.Core</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -40,6 +40,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/components/editorControls/umbraco.editorControls.csproj b/components/editorControls/umbraco.editorControls.csproj
index af991252a2..4206304045 100644
--- a/components/editorControls/umbraco.editorControls.csproj
+++ b/components/editorControls/umbraco.editorControls.csproj
@@ -37,7 +37,7 @@
     </SccProvider>
     <OldToolsVersion>3.5</OldToolsVersion>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/umbraco.editorControls/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -52,6 +52,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
diff --git a/components/umbraco.webservices/umbraco.webservices.csproj b/components/umbraco.webservices/umbraco.webservices.csproj
index 08cfae2b51..0f4212651f 100644
--- a/components/umbraco.webservices/umbraco.webservices.csproj
+++ b/components/umbraco.webservices/umbraco.webservices.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>umbraco.webservices</RootNamespace>
     <AssemblyName>umbraco.webservices</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -39,6 +39,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/umbraco.MacroEngines.Juno/DynamicNode.cs b/umbraco.MacroEngines.Juno/DynamicNode.cs
index 8178a3cb45..9718f4ec3b 100644
--- a/umbraco.MacroEngines.Juno/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/DynamicNode.cs
@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
 using umbraco.interfaces;
+using System.Collections;
+using System.Reflection;
 
 namespace umbraco.MacroEngines
 {
-    public class DynamicNode : DynamicObject
+    public class DynamicNode : DynamicObject, IEnumerable
     {
         private readonly INode n;
         public DynamicNode(INode n)
@@ -16,16 +18,111 @@ namespace umbraco.MacroEngines
             else
                 throw new ArgumentNullException("n", "A node must be provided to make a dynamic instance");
         }
+        public DynamicNode()
+        {
+            //Empty constructor for a special case with Generic Methods
+        }
 
-        public IEnumerable<DynamicNode> GetChildrenAsList
+        IEnumerable<INode> _children;
+        public DynamicNode(IEnumerable<INode> children)
+        {
+            _children = new List<INode>(children);
+        }
+        public IEnumerator GetEnumerator()
+        {
+            return _children.Select(x => new DynamicNode(x)).GetEnumerator();
+        }
+
+
+        public DynamicNode GetChildrenAsList
         {
             get
             {
-                return from nn in n.ChildrenAsList
-                       select new DynamicNode(nn);
+                return new DynamicNode(n.ChildrenAsList);
             }
         }
 
+        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        {
+            var name = binder.Name;
+
+            try
+            {
+                //Property?
+                result = _children.GetType().InvokeMember(binder.Name,
+                                                  System.Reflection.BindingFlags.Instance |
+                                                  System.Reflection.BindingFlags.Public |
+                                                  System.Reflection.BindingFlags.NonPublic |
+                                                  System.Reflection.BindingFlags.GetProperty,
+                                                  null,
+                                                  _children,
+                                                  args);
+                return true;
+            }
+            catch (MissingMethodException)
+            {
+                try
+                {
+                    //Static or Instance Method?
+                    result = _children.GetType().InvokeMember(binder.Name,
+                                                  System.Reflection.BindingFlags.Instance |
+                                                  System.Reflection.BindingFlags.Public |
+                                                  System.Reflection.BindingFlags.NonPublic |
+                                                  System.Reflection.BindingFlags.Static |
+                                                  System.Reflection.BindingFlags.InvokeMethod,
+                                                  null,
+                                                  _children,
+                                                  args);
+                    return true;
+                }
+                catch (MissingMethodException)
+                {
+                    try
+                    {
+                        //Extension method
+                        Type tObject = _children.GetType();
+                        Type t = tObject.GetGenericArguments()[0];
+                        Type tIEnumerable = typeof(IEnumerable<>).MakeGenericType(t);
+
+                        MethodInfo enumerableMethod =
+                            typeof(Enumerable)
+                            .GetMethod(name)
+                            .MakeGenericMethod(t);
+
+                        var genericArgs = (new[] { _children }).Concat(args);
+                        result = enumerableMethod.Invoke(null, genericArgs.ToArray());
+
+                        return true;
+                    }
+                    catch (TargetInvocationException)
+                    {
+                        //We do this to enable error checking of Razor Syntax when a method e.g. ElementAt(2) is used.
+                        //When the Script is tested, there's no INode which means no children which means ElementAt(2) is invalid (IndexOutOfRange)
+                        //Instead, we are going to return an empty DynamicNode.
+                        //This could be improved by checking return type of generic method above
+                        //So we could support Generic Methods that return IEnumerable as well as Singular
+                        result = new DynamicNode();
+                        return true;
+                    }
+                    catch
+                    {
+                        result = null;
+                        return false;
+                    }
+
+                }
+
+
+            }
+            catch
+            {
+                result = null;
+                return false;
+            }
+
+        }
+
+
         public override bool TryGetMember(GetMemberBinder binder, out object result)
         {
 
@@ -37,46 +134,52 @@ namespace umbraco.MacroEngines
                 return true;
             }
 
-            var data = n.GetProperty(name);
-            // check for nicer support of Pascal Casing EVEN if alias is camelCasing:
-            if (data == null && name.Substring(0,1).ToUpper() == name.Substring(0,1))
+            if (n != null)
             {
-                data = n.GetProperty(name.Substring(0, 1).ToLower() + name.Substring((1)));
+                var data = n.GetProperty(name);
+                // check for nicer support of Pascal Casing EVEN if alias is camelCasing:
+                if (data == null && name.Substring(0, 1).ToUpper() == name.Substring(0, 1))
+                {
+                    data = n.GetProperty(name.Substring(0, 1).ToLower() + name.Substring((1)));
+                }
+
+                if (data != null)
+                {
+                    result = data.Value;
+                    return true;
+                }
+
+                //check if the alias is that of a child type
+                var typeChildren = n.ChildrenAsList
+                    .Where(x => MakePluralName(x.NodeTypeAlias) == name || x.NodeTypeAlias == name);
+                if (typeChildren.Any())
+                {
+                    result = new DynamicNode(typeChildren);
+                    return true;
+                }
+
+                try
+                {
+                    result = n.GetType().InvokeMember(binder.Name,
+                                                      System.Reflection.BindingFlags.GetProperty |
+                                                      System.Reflection.BindingFlags.Instance |
+                                                      System.Reflection.BindingFlags.Public |
+                                                      System.Reflection.BindingFlags.NonPublic,
+                                                      null,
+                                                      n,
+                                                      null);
+                    return true;
+                }
+                catch
+                {
+                    result = null;
+                    return false;
+                }
             }
 
-            if (data != null)
-            {
-                result = data.Value;
-                return true;
-            }
 
-            //check if the alias is that of a child type
-            var typeChildren = n.ChildrenAsList
-                .Where(x => MakePluralName(x.NodeTypeAlias) == name || x.NodeTypeAlias == name);
-            if (typeChildren.Any())
-            {
-                result = typeChildren
-                    .Select(x => new DynamicNode(x));
-                return true;
-            }
-
-            try
-            {
-                result = n.GetType().InvokeMember(binder.Name,
-                                                  System.Reflection.BindingFlags.GetProperty |
-                                                  System.Reflection.BindingFlags.Instance |
-                                                  System.Reflection.BindingFlags.Public |
-                                                  System.Reflection.BindingFlags.NonPublic,
-                                                  null,
-                                                  n,
-                                                  null);
-                return true;
-            } 
-            catch
-            {
-                result = null;
-                return false;
-            }
+            result = null;
+            return false;
         }
 
         //this is from SqlMetal and just makes it a bit of fun to allow pluralisation
@@ -135,62 +238,62 @@ namespace umbraco.MacroEngines
 
         public DynamicNode Parent
         {
-            get { return new DynamicNode(n.Parent); }
+            get { if (n == null) return null; return new DynamicNode(n.Parent); }
         }
 
         public int Id
         {
-            get { return n.Id; }
+            get { if (n == null) return 0; return n.Id; }
         }
 
         public int template
         {
-            get { return n.template; }
+            get { if (n == null) return 0; return n.template; }
         }
 
         public int SortOrder
         {
-            get { return n.SortOrder; }
+            get { if (n == null) return 0; return n.SortOrder; }
         }
 
         public string Name
         {
-            get { return n.Name; }
+            get { if (n == null) return null; return n.Name; }
         }
 
         public string Url
         {
-            get { return n.Url; }
+            get { if (n == null) return null; return n.Url; }
         }
 
         public string UrlName
         {
-            get { return n.UrlName; }
+            get { if (n == null) return null; return n.UrlName; }
         }
 
         public string NodeTypeAlias
         {
-            get { return n.NodeTypeAlias; }
+            get { if (n == null) return null; return n.NodeTypeAlias; }
         }
 
         public string WriterName
         {
-            get { return n.WriterName; }
+            get { if (n == null) return null; return n.WriterName; }
         }
 
         public string CreatorName
         {
-            get { return n.CreatorName; }
+            get { if (n == null) return null; return n.CreatorName; }
         }
 
         public int WriterID
         {
-            get { return n.WriterID; }
+            get { if (n == null) return 0; return n.WriterID; }
         }
 
         public int CreatorID
         {
-            get { return n.CreatorID; }
+            get { if (n == null) return 0; return n.CreatorID; }
         }
 
         public string Path
@@ -200,52 +303,57 @@ namespace umbraco.MacroEngines
 
         public DateTime CreateDate
         {
-            get { return n.CreateDate; }
+            get { if (n == null) return DateTime.MinValue; return n.CreateDate; }
         }
 
         public DateTime UpdateDate
         {
-            get { return n.UpdateDate; }
+            get { if (n == null) return DateTime.MinValue; return n.UpdateDate; }
         }
 
         public Guid Version
         {
-            get { return n.Version; }
+            get { if (n == null) return Guid.Empty; return n.Version; }
         }
 
         public string NiceUrl
         {
-            get { return n.NiceUrl; }
+            get { if (n == null) return null; return n.NiceUrl; }
         }
 
         public int Level
         {
-            get { return n.Level; }
+            get { if (n == null) return 0; return n.Level; }
         }
 
         public List<IProperty> PropertiesAsList
         {
-            get { return n.PropertiesAsList; }
+            get { if (n == null) return null; return n.PropertiesAsList; }
         }
 
         public List<INode> ChildrenAsList
         {
-            get { return n.ChildrenAsList; }
+            get { if (n == null) return null; return n.ChildrenAsList; }
         }
 
         public IProperty GetProperty(string alias)
         {
+            if (n == null) return null;
             return n.GetProperty(alias);
         }
 
         public System.Data.DataTable ChildrenAsTable()
         {
+            if (n == null) return null;
             return n.ChildrenAsTable();
         }
 
         public System.Data.DataTable ChildrenAsTable(string nodeTypeAliasFilter)
         {
+            if (n == null) return null;
             return n.ChildrenAsTable(nodeTypeAliasFilter);
         }
+
+
     }
 }
diff --git a/umbraco.MacroEngines.Juno/RazorEngine.cs b/umbraco.MacroEngines.Juno/RazorEngine.cs
index a298af799b..0c9341fb51 100644
--- a/umbraco.MacroEngines.Juno/RazorEngine.cs
+++ b/umbraco.MacroEngines.Juno/RazorEngine.cs
@@ -25,7 +25,7 @@ namespace umbraco.MacroEngines
         {
             get
             {
-                var exts = new List<string> {"razor"};
+                var exts = new List<string> { "razor" };
                 return exts;
             }
         }
@@ -40,7 +40,8 @@ namespace umbraco.MacroEngines
             try
             {
                 string parsedResult;
-                if (!GetResult(null, code, currentPage, out parsedResult)) {
+                if (!GetResult(null, code, currentPage, out parsedResult))
+                {
                     errorMessage = parsedResult;
                     return false;
                 }
@@ -53,8 +54,8 @@ namespace umbraco.MacroEngines
             }
 
             // clear razor compilation cache (a hack - by setting the template base type back/forward as there isn't a clear cache method)
-            Razor.SetTemplateBaseType(typeof (HtmlTemplateBase<>));
-            Razor.SetTemplateBaseType(typeof (UmbracoTemplateBase<>));
+            Razor.SetTemplateBaseType(typeof(HtmlTemplateBase<>));
+            Razor.SetTemplateBaseType(typeof(UmbracoTemplateBase<>));
 
 
             errorMessage = String.Empty;
@@ -70,7 +71,8 @@ namespace umbraco.MacroEngines
             GetResult(macro.CacheIdentifier, template, currentPage, out parsedResult);
 
             // if it's a file we'll monitor changes to ensure that any updates to the file clears the cache
-            if (String.IsNullOrEmpty(macro.ScriptCode)) {
+            if (String.IsNullOrEmpty(macro.ScriptCode))
+            {
                 FileMonitor.Listen(SystemDirectories.Python + "/" + macro.ScriptName, action => RazorEngine.ClearRazorCompilationCache());
             }
 
@@ -92,7 +94,7 @@ namespace umbraco.MacroEngines
         {
             try
             {
-                Razor.SetTemplateBaseType(typeof (UmbracoTemplateBase<>));
+                Razor.SetTemplateBaseType(typeof(UmbracoTemplateBase<>));
                 result = Razor.Parse(template, new DynamicNode(currentPage), cacheIdentifier);
                 return true;
             }
@@ -149,7 +151,7 @@ namespace umbraco.MacroEngines
 
         public override T Model
         {
-            get { return (T) m_model; }
+            get { return (T)m_model; }
             set { m_model = value; }
         }
 
diff --git a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
index 2de07b2d3b..dd3454dd8c 100644
--- a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
+++ b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
@@ -88,7 +88,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(ProjectDir)bin\debug\umbraco.MacroEngines.*" "$(ProjectDir)..\presentation\bin\" /Y</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(ProjectDir)bin\debug\umbraco.MacroEngines.*" "$(ProjectDir)..\presentation\bin\" /Y/F</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/umbraco.sln b/umbraco.sln
index d2f97ac4ff..275d5e4a82 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -177,6 +177,7 @@ Global
 		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/umbraco/presentation/Web References/org.umbraco.update/Reference.cs b/umbraco/presentation/Web References/org.umbraco.update/Reference.cs
index 4c4bbdd18e..fb5054fcf5 100644
--- a/umbraco/presentation/Web References/org.umbraco.update/Reference.cs	
+++ b/umbraco/presentation/Web References/org.umbraco.update/Reference.cs	
@@ -35,7 +35,7 @@ namespace umbraco.presentation.org.umbraco.update {
         
         /// <remarks/>
         public CheckForUpgrade() {
-            this.Url = "http://update.umbraco.org/checkforupgrade.asmx";
+            this.Url = global::umbraco.presentation.Properties.Settings.Default.umbraco_org_umbraco_update_CheckForUpgrade;
             if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
                 this.UseDefaultCredentials = true;
                 this.useDefaultCredentialsSetExplicitly = false;
diff --git a/umbraco/presentation/Web References/org.umbraco.update/UpgradeResult.datasource b/umbraco/presentation/Web References/org.umbraco.update/UpgradeResult.datasource
index 2f8b9cd423..533f51b9fe 100644
--- a/umbraco/presentation/Web References/org.umbraco.update/UpgradeResult.datasource	
+++ b/umbraco/presentation/Web References/org.umbraco.update/UpgradeResult.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="UpgradeResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>umbraco.presentation.org.umbraco.update.UpgradeResult</TypeInfo>
+   <TypeInfo>umbraco.presentation.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 4eb7eb118b..7ed4b8a2f9 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -36,7 +36,7 @@
     <SccProvider>
     </SccProvider>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -132,6 +132,7 @@
     <Reference Include="System.Web.Abstractions">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
@@ -1642,6 +1643,7 @@
     </Compile>
     <Content Include="config\splashes\booting.aspx" />
     <Content Include="config\splashes\noNodes.aspx" />
+    <Content Include="web.config.ssaolap01.xslt" />
     <Content Include="umbraco_client\Installer\images\bg-inp-big.png" />
     <Content Include="umbraco_client\modal\jquery.simplemodal.1.4.1.custom.js" />
     <Content Include="web.config.INDIGO64SSD.xslt" />
diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config
index c203a6de19..d51765a1e9 100644
--- a/umbraco/presentation/web.STANDARD.config
+++ b/umbraco/presentation/web.STANDARD.config
@@ -76,7 +76,7 @@
         <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
     </connectionStrings>
     <system.web>
-        <httpRuntime requestValidationMode="2.0" />
+        <httpRuntime/> <!--requestValidationMode="2.0"-->
         <customErrors mode="Off" />
         <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
         <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
index ec10d6c1d8..ea4ae790a8 100644
--- a/umbraco/presentation/web.config
+++ b/umbraco/presentation/web.config
@@ -33,8 +33,8 @@
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <appSettings>
-    <add key="umbracoDbDSN" value="Data Source=.\SQLEXPRESS;Initial Catalog=Dev.Umbraco.4x;integrated security=false;user id=umbraco;pwd=umbraco" />
-    <add key="umbracoConfigurationStatus" value="" />
+    <add key="umbracoDbDSN" value="server=ssaolap01;database=umbracodev;integrated security=false;user id=dev;pwd=dev" />
+    <add key="umbracoConfigurationStatus" value="4.6.1" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
@@ -65,14 +65,13 @@
       </smtp>
     </mailSettings>
   </system.net>
-  <!-- REMOVE FOR BETA -->
-  <!-- added by NH to test foreign membership providers-->
   <connectionStrings>
     <remove name="LocalSqlServer" />
     <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
   </connectionStrings>
   <system.web>
-    <!-- <trust level="Medium" originUrl=".*" /> -->
+    <httpRuntime />
+    <!--requestValidationMode="2.0"-->
     <customErrors mode="Off" />
     <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
     <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />