diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 7d929c100a..57efb98044 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -196,6 +196,7 @@
 		<MenuItem id    = "Paste"
 		          label = "${res:XML.MainMenu.EditMenu.Paste}"
 		          icon  = "Icons.16x16.PasteIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
 		<MenuItem id       = "Rename"
 		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
@@ -212,25 +213,7 @@
 		<Include id = "CombineAddMenu" item="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionNode/CombineAddMenu"/>
 		
 		<MenuItem id = "AddSeparator" type = "Separator"/>
-		<MenuItem id    = "Cut"
-		          label = "${res:XML.MainMenu.EditMenu.Cut}"
-		          type  = "Item"
-		          icon  = "Icons.16x16.CutIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
-		<MenuItem id    = "Paste"
-		          label = "${res:XML.MainMenu.EditMenu.Paste}"
-		          type  = "Item"
-		          icon  = "Icons.16x16.PasteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
-		<MenuItem id    = "Remove"
-		          type  = "Item"
-		          label = "${res:Global.RemoveButtonText}"
-		          icon  = "Icons.16x16.DeleteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
-		<MenuItem id       = "Rename"
-		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
-		          shortcut = "F2"
-		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
+		<Include id="CutPasteRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutPasteRemoveRename"/>
 	</Path>
 	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionItemNode">
@@ -239,25 +222,7 @@
 		          icon  = "Icons.16x16.OpenFileIcon"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.OpenFileEvent"/>
 		<MenuItem id = "OpenSeparator" type = "Separator" />
-		<MenuItem id = "Cut"
-		          label = "${res:XML.MainMenu.EditMenu.Cut}"
-		          type = "Item"
-		          icon = "Icons.16x16.CutIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
-		<MenuItem id = "Copy"
-		          label = "${res:XML.MainMenu.EditMenu.Copy}"
-		          type = "Item"
-		          icon = "Icons.16x16.CopyIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
-		<MenuItem id = "Remove"
-		          label = "${res:Global.RemoveButtonText}"
-		          type = "Item"
-		          icon  = "Icons.16x16.DeleteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
-		<MenuItem id       = "Rename"
-		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
-		          shortcut = "F2"
-		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
+		<Include id="CutCopyRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyRemoveRename"/>
 	</Path>
 	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
@@ -271,9 +236,9 @@
 		<MenuItem id = "Clean project"
 		          label = "${res:ProjectComponent.ContextMenu.Clean}"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
-		<MenuItem id = "Publish project"
+		<!--<MenuItem id = "Publish project"
 		          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
 		<MenuItem id = "CombineBuildGroupSeparator" type = "Separator"/>
 		
 		<MenuItem id = "ProjectAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu" >
@@ -414,6 +379,31 @@
 		</ComplexCondition>
 	</Path>
 	
+	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyRemoveRename">
+		<MenuItem id = "Cut"
+		          label = "${res:XML.MainMenu.EditMenu.Cut}"
+		          type = "Item"
+		          icon = "Icons.16x16.CutIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
+		<MenuItem id = "Copy"
+		          label = "${res:XML.MainMenu.EditMenu.Copy}"
+		          type = "Item"
+		          icon = "Icons.16x16.CopyIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
+		<MenuItem id = "Remove"
+		          label = "${res:Global.RemoveButtonText}"
+		          type = "Item"
+		          icon  = "Icons.16x16.DeleteIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
+		<MenuItem id = "Rename"
+		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
+		          shortcut = "F2"
+		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
+	</Path>
+	
 	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutPasteRemoveRename">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"
@@ -1343,9 +1333,9 @@
 					<MenuItem id    = "Clean project"
 					          label = "${res:XML.MainMenu.BuildMenu.CleanProject}"
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
-					<MenuItem id    = "Publish project"
+					<!--<MenuItem id    = "Publish project"
 					          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
 				</Condition>
 				<MenuItem id = "Separator2" type = "Separator" />
 				<MenuItem id = "SetConfiguration"
diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources
index eb13aad2a6..98a9952f4f 100644
Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ
diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources
index 1e4a4210e8..a482311c2d 100644
Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ
diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources
index 37a08f0583..91f405b36b 100644
Binary files a/data/resources/StringResources.es-mx.resources and b/data/resources/StringResources.es-mx.resources differ
diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources
index 8c26ae2fd2..c4013d28e7 100644
Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ
diff --git a/data/resources/StringResources.fr.resources b/data/resources/StringResources.fr.resources
index 4e2c62cf7a..cd1e300eaf 100644
Binary files a/data/resources/StringResources.fr.resources and b/data/resources/StringResources.fr.resources differ
diff --git a/data/resources/StringResources.hu.resources b/data/resources/StringResources.hu.resources
index aedf123e9c..ec2a232f21 100644
Binary files a/data/resources/StringResources.hu.resources and b/data/resources/StringResources.hu.resources differ
diff --git a/data/resources/StringResources.it.resources b/data/resources/StringResources.it.resources
index c9045fbc56..3b85855fc4 100644
Binary files a/data/resources/StringResources.it.resources and b/data/resources/StringResources.it.resources differ
diff --git a/data/resources/StringResources.kr.resources b/data/resources/StringResources.kr.resources
index c7eb09937b..536406bb27 100644
Binary files a/data/resources/StringResources.kr.resources and b/data/resources/StringResources.kr.resources differ
diff --git a/data/resources/StringResources.nl.resources b/data/resources/StringResources.nl.resources
index 136d727fbf..316af36b62 100644
Binary files a/data/resources/StringResources.nl.resources and b/data/resources/StringResources.nl.resources differ
diff --git a/data/resources/StringResources.pt-br.resources b/data/resources/StringResources.pt-br.resources
index 53e534c68d..333b2a1b0d 100644
Binary files a/data/resources/StringResources.pt-br.resources and b/data/resources/StringResources.pt-br.resources differ
diff --git a/data/resources/StringResources.ro.resources b/data/resources/StringResources.ro.resources
index 41a8e66298..7b58613610 100644
Binary files a/data/resources/StringResources.ro.resources and b/data/resources/StringResources.ro.resources differ
diff --git a/data/templates/project/CSharp/ConsoleProject.xpt b/data/templates/project/CSharp/ConsoleProject.xpt
index dbc817de2c..61cb895b65 100644
--- a/data/templates/project/CSharp/ConsoleProject.xpt
+++ b/data/templates/project/CSharp/ConsoleProject.xpt
@@ -47,34 +47,7 @@ namespace ${StandardNamespace}
 		}
 	}
 }]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+			<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/ControlLibrary.xpt b/data/templates/project/CSharp/ControlLibrary.xpt
index 3397c3f022..b3ea6b323d 100644
--- a/data/templates/project/CSharp/ControlLibrary.xpt
+++ b/data/templates/project/CSharp/ControlLibrary.xpt
@@ -102,35 +102,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/DefaultAssemblyInfo.cs b/data/templates/project/CSharp/DefaultAssemblyInfo.cs
new file mode 100644
index 0000000000..17a1d024a7
--- /dev/null
+++ b/data/templates/project/CSharp/DefaultAssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("${ProjectName}")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("${ProjectName}")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/data/templates/project/CSharp/Direct3DProject.xpt b/data/templates/project/CSharp/Direct3DProject.xpt
index 282742c80f..3c5c38e6e5 100644
--- a/data/templates/project/CSharp/Direct3DProject.xpt
+++ b/data/templates/project/CSharp/Direct3DProject.xpt
@@ -171,34 +171,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-			<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+			<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/FormsProject.xpt b/data/templates/project/CSharp/FormsProject.xpt
index f0b558daaa..c67b68f850 100644
--- a/data/templates/project/CSharp/FormsProject.xpt
+++ b/data/templates/project/CSharp/FormsProject.xpt
@@ -112,35 +112,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="AssemblyInfo.cs" language="C#">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/GladeProject.xpt b/data/templates/project/CSharp/GladeProject.xpt
index 6f807f6a71..2ca860cc81 100644
--- a/data/templates/project/CSharp/GladeProject.xpt
+++ b/data/templates/project/CSharp/GladeProject.xpt
@@ -105,35 +105,7 @@ namespace ${StandardNamespace}
 
 </glade-interface>
 ]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Solution>
diff --git a/data/templates/project/CSharp/GtkProject.xpt b/data/templates/project/CSharp/GtkProject.xpt
index 70c4323a60..e05c524e19 100644
--- a/data/templates/project/CSharp/GtkProject.xpt
+++ b/data/templates/project/CSharp/GtkProject.xpt
@@ -76,35 +76,7 @@ namespace ${StandardNamespace}
 		}
 	}
 }]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Solution>
diff --git a/data/templates/project/CSharp/Library.xpt b/data/templates/project/CSharp/Library.xpt
index 9a64dfe2f5..cd74437347 100644
--- a/data/templates/project/CSharp/Library.xpt
+++ b/data/templates/project/CSharp/Library.xpt
@@ -46,35 +46,7 @@ namespace ${StandardNamespace}
 			
 	}
 }]]></File>
-		<File name="AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/Service.xpt b/data/templates/project/CSharp/Service.xpt
index d42ffdb809..de00515a69 100644
--- a/data/templates/project/CSharp/Service.xpt
+++ b/data/templates/project/CSharp/Service.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "02/01/2003"
-          lastModified = "14/01/2006">
+          lastModified = "16/06/2006">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -29,6 +29,7 @@
 
 			<ProjectItems>
 				<Reference Include="System" />
+				<Reference Include="System.Configuration.Install" />
 				<Reference Include="System.Data" />
 				<Reference Include="System.ServiceProcess" />
 				<Reference Include="System.Xml" />
@@ -49,6 +50,8 @@ namespace ${StandardNamespace}
 {
 	public class ${ProjectName} : ServiceBase
 	{
+		public const string MyServiceName = "${ProjectName}";
+		
 		public ${ProjectName}()
 		{
 			InitializeComponent();
@@ -56,7 +59,7 @@ namespace ${StandardNamespace}
 		
 		private void InitializeComponent()
 		{
-			this.ServiceName = "${ProjectName}";
+			this.ServiceName = MyServiceName;
 		}
 		
 		/// <summary>
@@ -85,6 +88,35 @@ namespace ${StandardNamespace}
 		}
 	}
 }
+]]></File>
+				<File name="ProjectInstaller.cs"><![CDATA[${StandardHeader.C#}
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Install;
+using System.ServiceProcess;
+
+namespace ${StandardNamespace}
+{
+	[RunInstaller(true)]
+	public class ProjectInstaller : Installer
+	{
+		private ServiceProcessInstaller serviceProcessInstaller;
+		private ServiceInstaller serviceInstaller;
+		
+		public ProjectInstaller()
+		{
+			serviceProcessInstaller = new ServiceProcessInstaller();
+			serviceInstaller = new ServiceInstaller();
+			// Here you can set properties on serviceProcessInstaller or register event handlers
+			serviceProcessInstaller.Account = ServiceAccount.LocalService;
+			
+			serviceInstaller.ServiceName = ${ProjectName}.MyServiceName;
+			this.Installers.AddRange(new Installer[] { serviceProcessInstaller, serviceInstaller });
+		}
+	}
+}
 ]]></File>
 				<File name="Program.cs"><![CDATA[${StandardHeader.C#}
 
@@ -108,34 +140,7 @@ namespace ${ProjectName}
 	}
 }
 ]]></File>
-				<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+				<File name="AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/SharpDevelopAddin.xpt b/data/templates/project/CSharp/SharpDevelopAddin.xpt
index 41b0f9b201..9096a7f680 100644
--- a/data/templates/project/CSharp/SharpDevelopAddin.xpt
+++ b/data/templates/project/CSharp/SharpDevelopAddin.xpt
@@ -157,35 +157,7 @@ namespace ${ProjectName}
 	}
 }
 ]]></File>
-		<File name="Configuration/AssemblyInfo.cs">
-			<![CDATA[using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("${ProjectName}")]
-[assembly: AssemblyDescription("Addin for SharpDevelop 2.0")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="Configuration/AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/CSharp/SharpDevelopMacro.xpt b/data/templates/project/CSharp/SharpDevelopMacro.xpt
index 38af382366..9bfe54d3d3 100644
--- a/data/templates/project/CSharp/SharpDevelopMacro.xpt
+++ b/data/templates/project/CSharp/SharpDevelopMacro.xpt
@@ -100,30 +100,7 @@ namespace ${StandardNamespace}
 	}
 }
 ]]></File>
-		<File name="Configuration/AssemblyInfo.cs">
-			<![CDATA[${StandardHeader.C#}
-
-using System.Reflection;
-
-[assembly: AssemblyTitle("${ProjectName}")]
-[assembly: AssemblyDescription("Macro AddIn for SharpDevelop 2.0")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-]]></File>
+		<File name="Configuration/AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt
index a85590754a..fdf46341a7 100644
--- a/data/templates/project/VBNet/ConsoleProject.xpt
+++ b/data/templates/project/VBNet/ConsoleProject.xpt
@@ -51,6 +51,7 @@ Module Main
 	End Sub
 End Module
 ]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/ControlLibrary.xpt b/data/templates/project/VBNet/ControlLibrary.xpt
index 26cdfb397a..72c7d81016 100644
--- a/data/templates/project/VBNet/ControlLibrary.xpt
+++ b/data/templates/project/VBNet/ControlLibrary.xpt
@@ -92,35 +92,7 @@ Partial Class UserControl1
 	End Sub
 End Class
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-' 
-' Change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-
-]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/DefaultAssemblyInfo.vb b/data/templates/project/VBNet/DefaultAssemblyInfo.vb
new file mode 100644
index 0000000000..719627fbe9
--- /dev/null
+++ b/data/templates/project/VBNet/DefaultAssemblyInfo.vb
@@ -0,0 +1,31 @@
+Imports System.Reflection
+Imports System.Runtime.CompilerServices
+Imports System.Runtime.InteropServices
+
+' Information about this assembly is defined by the following
+' attributes.
+'
+' change them to the information which is associated with the assembly
+' you compile.
+
+<assembly: AssemblyTitle("${ProjectName}")>
+<assembly: AssemblyDescription("")>
+<assembly: AssemblyConfiguration("")>
+<assembly: AssemblyCompany("")>
+<assembly: AssemblyProduct("${ProjectName}")>
+<assembly: AssemblyCopyright("")>
+<assembly: AssemblyTrademark("")>
+<assembly: AssemblyCulture("")>
+
+' This sets the default COM visibility of types in the assembly to invisible.
+' If you need to expose a type to COM, use <ComVisible(true)> on that type.
+<assembly: ComVisible(False)>
+
+' The assembly version has following format :
+'
+' Major.Minor.Build.Revision
+'
+' You can specify all values by your own or you can build default build and revision
+' numbers with the '*' character (the default):
+
+<assembly: AssemblyVersion("1.0.*")>
diff --git a/data/templates/project/VBNet/Direct3DProject.xpt b/data/templates/project/VBNet/Direct3DProject.xpt
index 30c6edefbd..2866e2d71b 100644
--- a/data/templates/project/VBNet/Direct3DProject.xpt
+++ b/data/templates/project/VBNet/Direct3DProject.xpt
@@ -154,33 +154,7 @@ Public Class MainClass
 	End Sub
 End Class
 ]]></File>
-			<File name="AssemblyInfo.vb"><![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-'	<ProjectOptions Target = "WinExe" PauseConsoleOutput = "False" />
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+			<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/FormsProject.xpt b/data/templates/project/VBNet/FormsProject.xpt
index 35eac0db45..f8bbac6005 100644
--- a/data/templates/project/VBNet/FormsProject.xpt
+++ b/data/templates/project/VBNet/FormsProject.xpt
@@ -116,34 +116,7 @@ Namespace My
 	End Class
 End Namespace
 ]]></File>
-			<File name="AssemblyInfo.vb">
-				<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-'
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+			<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Library.xpt b/data/templates/project/VBNet/Library.xpt
index a6f55fb844..35648576f4 100644
--- a/data/templates/project/VBNet/Library.xpt
+++ b/data/templates/project/VBNet/Library.xpt
@@ -46,34 +46,7 @@ Public Class NewClass
 	
 End Class
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-' Information about this assembly is defined by the following
-' attributes.
-' 
-' Change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Service.xpt b/data/templates/project/VBNet/Service.xpt
index c80d0ab09d..f347b328d1 100644
--- a/data/templates/project/VBNet/Service.xpt
+++ b/data/templates/project/VBNet/Service.xpt
@@ -27,8 +27,8 @@
 			
 			<ProjectItems>
 				<Reference Include="System" />
+				<Reference Include="System.Configuration.Install" />
 				<Reference Include="System.Data" />
-				<Reference Include="System.Deployment" />
 				<Reference Include="System.ServiceProcess" />
 				<Reference Include="System.Xml" />
 				
@@ -49,6 +49,8 @@ Imports System.ServiceProcess
 Public Class ${ProjectName}
 	Inherits ServiceBase
 	
+	Public Const MyServiceName As String = "${ProjectName}"
+	
 	' The main entry point for the process
 	<MTAThread()> _
 	Shared Sub Main()
@@ -56,6 +58,10 @@ Public Class ${ProjectName}
 		ServiceBase.Run(New ServiceBase() {New ${ProjectName}})
 	End Sub
 	
+	Public Sub New()
+		Me.ServiceName = MyServiceName
+	End Sub
+	
 	Protected Overrides Sub OnStart(ByVal args() As String)
 		' TODO: Add start code here to start your service.
 	End Sub
@@ -66,34 +72,30 @@ Public Class ${ProjectName}
 End Class
 
 ]]></File>
-		<File name="AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
+				<File name="ProjectInstaller.vb"><![CDATA[${StandardHeader.VBNET}
 
-' Information about this assembly is defined by the following
-' attributes.
-'
-' change them to the information which is associated with the assembly
-' you compile.
-
-<assembly: AssemblyTitle("")>
-<assembly: AssemblyDescription("")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
+Imports System.ComponentModel
+Imports System.Configuration.Install
+Imports System.ServiceProcess
 
-' The assembly version has following format :
-'
-' Major.Minor.Build.Revision
-'
-' You can specify all values by your own or you can build default build and revision
-' numbers with the '*' character (the default):
+<RunInstaller(True)> _
+Public Class ProjectInstaller
+	Inherits Installer
+	
+	Private serviceProcessInstaller As New ServiceProcessInstaller
+	Private serviceInstaller As New ServiceInstaller
+	
+	Public Sub New()
+		' Here you can set properties on serviceProcessInstaller or register event handlers
+		serviceProcessInstaller.Account = ServiceAccount.LocalService
+		
+		serviceInstaller.ServiceName = ${ProjectName}.MyServiceName
+		Me.Installers.AddRange(New Installer() { serviceProcessInstaller, serviceInstaller })
+	End Sub
+End Class
 
-<assembly: AssemblyVersion("1.0.*")>
 ]]></File>
+		<File name="AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/SharpDevelopAddin.xpt b/data/templates/project/VBNet/SharpDevelopAddin.xpt
index 4838af703a..12c37e4d97 100644
--- a/data/templates/project/VBNet/SharpDevelopAddin.xpt
+++ b/data/templates/project/VBNet/SharpDevelopAddin.xpt
@@ -146,36 +146,7 @@ Public Class TestPad
 	End Sub
 End Class
 ]]></File>
-		<File name="Configuration/AssemblyInfo.vb">
-			<![CDATA[Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-'Information about this assembly is defined by the following
-'attributes.
-
-'change them to the information which is associated with the assembly
-'you compile.
-
-<assembly: AssemblyTitle("${ProjectName}")>
-<assembly: AssemblyDescription("Addin for SharpDevelop 2.0")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("SharpDevelop")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-'The assembly version has following format :
-
-'Major.Minor.Build.Revision
-
-'You can specify all values by your own or you can build default build and revision
-'numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-
-]]>
-				</File>
+		<File name="Configuration/AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/data/templates/project/VBNet/SharpDevelopMacro.xpt b/data/templates/project/VBNet/SharpDevelopMacro.xpt
index 410058b67c..67d553a675 100644
--- a/data/templates/project/VBNet/SharpDevelopMacro.xpt
+++ b/data/templates/project/VBNet/SharpDevelopMacro.xpt
@@ -98,36 +98,7 @@ Inherits AbstractMenuCommand
 	End Sub
 End Class
 ]]></File>
-		<File name="Configuration/AssemblyInfo.vb">
-			<![CDATA[${StandardHeader.VBNET}
-
-Imports System.Reflection
-Imports System.Runtime.CompilerServices
-
-'Information about this assembly is defined by the following
-'attributes.
-'
-'change them to the information which is associated with the assembly
-'you compile.
-
-<assembly: AssemblyTitle("${ProjectName}")>
-<assembly: AssemblyDescription("Addin for SharpDevelop 2.0")>
-<assembly: AssemblyConfiguration("")>
-<assembly: AssemblyCompany("")>
-<assembly: AssemblyProduct("SharpDevelop")>
-<assembly: AssemblyCopyright("")>
-<assembly: AssemblyTrademark("")>
-<assembly: AssemblyCulture("")>
-
-'The assembly version has following format :
-'
-'Major.Minor.Build.Revision
-'
-'You can specify all values by your own or you can build default build and revision
-'numbers with the '*' character (the default):
-
-<assembly: AssemblyVersion("1.0.*")>
-]]></File>
+		<File name="Configuration/AssemblyInfo.vb" src="DefaultAssemblyInfo.vb"/>
 			</Files>
 		</Project>
 	</Combine>
diff --git a/samples/SharpReport/ReportSamples/MainForm.Designer.cs b/samples/SharpReport/ReportSamples/MainForm.Designer.cs
index b943558772..eabccca6a4 100644
--- a/samples/SharpReport/ReportSamples/MainForm.Designer.cs
+++ b/samples/SharpReport/ReportSamples/MainForm.Designer.cs
@@ -36,6 +36,7 @@ namespace ReportSamples
 		/// </summary>
 		private void InitializeComponent()
 		{
+			this.components = new System.ComponentModel.Container();
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.formSheetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.simpleFormsSheetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -45,7 +46,11 @@ namespace ReportSamples
 			this.missingConnectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.pushModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.emlpoyeesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components);
+			this.unboundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.unboundToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// menuStrip1
@@ -53,7 +58,8 @@ namespace ReportSamples
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
 									this.formSheetToolStripMenuItem,
 									this.pullMpToolStripMenuItem,
-									this.pushModelToolStripMenuItem});
+									this.pushModelToolStripMenuItem,
+									this.unboundToolStripMenuItem});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
 			this.menuStrip1.Size = new System.Drawing.Size(518, 24);
@@ -121,6 +127,25 @@ namespace ReportSamples
 			this.emlpoyeesToolStripMenuItem.Text = "Employees-Push";
 			this.emlpoyeesToolStripMenuItem.Click += new System.EventHandler(this.EmployeesPushClick);
 			// 
+			// errorProvider1
+			// 
+			this.errorProvider1.ContainerControl = this;
+			// 
+			// unboundToolStripMenuItem
+			// 
+			this.unboundToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.unboundToolStripMenuItem1});
+			this.unboundToolStripMenuItem.Name = "unboundToolStripMenuItem";
+			this.unboundToolStripMenuItem.Size = new System.Drawing.Size(62, 20);
+			this.unboundToolStripMenuItem.Text = "Unbound";
+			// 
+			// unboundToolStripMenuItem1
+			// 
+			this.unboundToolStripMenuItem1.Name = "unboundToolStripMenuItem1";
+			this.unboundToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+			this.unboundToolStripMenuItem1.Text = "Unbound";
+			this.unboundToolStripMenuItem1.Click += new System.EventHandler(this.UnboundToolStripMenuItem1Click);
+			// 
 			// MainForm
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -132,9 +157,13 @@ namespace ReportSamples
 			this.Text = "ReportSamples";
 			this.menuStrip1.ResumeLayout(false);
 			this.menuStrip1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).EndInit();
 			this.ResumeLayout(false);
 			this.PerformLayout();
 		}
+		private System.Windows.Forms.ToolStripMenuItem unboundToolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem unboundToolStripMenuItem;
+		private System.Windows.Forms.ErrorProvider errorProvider1;
 		private System.Windows.Forms.ToolStripMenuItem emlpoyeesToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem missingConnectionToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem employeeToolStripMenuItem;
diff --git a/samples/SharpReport/ReportSamples/MainForm.cs b/samples/SharpReport/ReportSamples/MainForm.cs
index 8776e78afb..2e5ccd6bf4 100644
--- a/samples/SharpReport/ReportSamples/MainForm.cs
+++ b/samples/SharpReport/ReportSamples/MainForm.cs
@@ -84,6 +84,83 @@ namespace ReportSamples
 				MessageBox.Show(er.ToString(),"MainForm");
 			}
 		}
+		
+		private void OpenUnbound() {
+			try{
+				OpenFileDialog dg = new OpenFileDialog();
+				dg.Filter = "SharpReport files|*.srd";
+				dg.Title = "Select a report file: ";
+				if (dg.ShowDialog() == DialogResult.OK){
+					SharpReportCore.SharpReportEngine mn = new SharpReportCore.SharpReportEngine();
+					mn.SectionRendering += new EventHandler<SectionRenderEventArgs>(OnTestPrinting);
+					mn.SectionRendered += new EventHandler<SectionRenderEventArgs>(OnTestPrinted);
+					mn.PreviewStandartReport(dg.FileName.ToString());
+					
+				}
+			}
+			catch(Exception er){
+				MessageBox.Show(er.ToString(),"MainForm");
+			}
+		}
+		
+		private void OnTestPrinting (object sender,SectionRenderEventArgs e) {
+			System.Console.WriteLine("");
+			System.Console.WriteLine("--------------");
+			System.Console.WriteLine("MainForm:OnTestPrinting on PageNr <{0}>",e.PageNumber);
+			System.Console.WriteLine("\t SectionInUse <{0}>",e.CurrentSection);
+			System.Console.WriteLine("\t <{0}> Items",e.Section.Items.Count);
+
+		
+			switch (e.CurrentSection) {
+				case GlobalEnums.enmSection.ReportHeader:
+					System.Console.WriteLine("I found the ReportHeader");
+					break;
+				case GlobalEnums.enmSection.ReportPageHeader:
+					
+					BaseTextItem t = (BaseTextItem)e.Section.Items.Find("reportTextItem1");
+					if (t != null) {
+						t.Location = new Point(80,5);
+						t.Text = "Label";
+					}
+					
+					
+					BaseDataItem bb = (BaseDataItem)e.Section.Items.Find("reportDbTextItem1");
+					if (bb != null) {
+						bb.DrawBorder = true;
+						bb.Location = new Point(200,5);
+						bb.DbValue = "Hello World";
+					}
+					
+					System.Console.WriteLine("I found the Pageheader");
+					break;
+				case GlobalEnums.enmSection.ReportDetail:
+					System.Console.WriteLine("I found the ReportDetail");
+					break;
+				case GlobalEnums.enmSection.ReportPageFooter:
+					System.Console.WriteLine("I found the PageFooter");
+					BaseReportItem b = (BaseReportItem)e.Section.Items.Find("pageNumber1");
+					if (b != null) {
+						b.BackColor = Color.AliceBlue;
+					} else {
+						string s = String.Format ("<{0}> not found");
+						MessageBox.Show (s);
+					}
+					break;
+				case GlobalEnums.enmSection.ReportFooter:
+					System.Console.WriteLine("I found the ReportFooter");
+					break;
+				default:
+					
+					break;
+			}
+			System.Console.WriteLine("");
+		}
+		
+		private void OnTestPrinted (object sender,SectionRenderEventArgs e) {
+			System.Console.WriteLine("MainForm:OnTestPrinted for <{0}>",e.CurrentSection);
+			System.Console.WriteLine("----------");
+		}
+		
 		///<summary>Preferd Method to initialise the <see cref="SharpReportCore.ConnectionObject"></see>
 		/// hav a look to
 		/// <http://msdn2.microsoft.com/en-us/library/system.data.oledb.oledbconnectionstringbuilder(VS.80).aspx>
@@ -134,8 +211,8 @@ namespace ReportSamples
 					reportFileName = dg.FileName.ToString();
 					DataTable table = SelectData();
 					if (table != null) {
-//						mn.PreviewPushDataReport(reportFileName,table);
-						mn.PrintPushDataReport(reportFileName,table);
+						mn.PreviewPushDataReport(reportFileName,table);
+//						mn.PrintPushDataReport(reportFileName,table);
 					}
 				}
 			}
@@ -143,7 +220,7 @@ namespace ReportSamples
 				
 			}			
 		}
-		
+	
 		private DataTable SelectData()
 		{
 			OpenFileDialog dg = new OpenFileDialog();
@@ -193,5 +270,10 @@ namespace ReportSamples
 		{
 			OpenPushModell();
 		}
+		
+		void UnboundToolStripMenuItem1Click(object sender, System.EventArgs e)
+		{
+			this.OpenUnbound();
+		}
 	}
 }
diff --git a/samples/SharpReport/ReportSamples/MainForm.resx b/samples/SharpReport/ReportSamples/MainForm.resx
index 3e14bf8ccb..f11771f907 100644
--- a/samples/SharpReport/ReportSamples/MainForm.resx
+++ b/samples/SharpReport/ReportSamples/MainForm.resx
@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>141, 17</value>
+  </metadata>
+  <metadata name="errorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/samples/SharpReport/Unbound/UnboundReport.srd b/samples/SharpReport/Unbound/UnboundReport.srd
new file mode 100644
index 0000000000..fa240590df
--- /dev/null
+++ b/samples/SharpReport/Unbound/UnboundReport.srd
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><SharpReport><section name="SharpReportCore.ReportSettings"><ReportType value="FormSheet" /><ConnectionString value="" /><CommandText value="" /><CommandType value="0" /><DataModel value="FormSheet" /><DefaultFont value="Microsoft Sans Serif, 10pt" /><ReportName value="SharpReport1" /><DefaultMargins value="50; 50; 50; 50" /><GridSize value="{Width=8, Height=8}" /><Padding value="{Left=5,Top=5,Right=5,Bottom=5}" /></section><section name="ReportHeader"><BackColor value="Color [Window]" /><Size value="{Width=787, Height=40}" /><SectionMargin value="50" /><PageBreakAfter value="False" /><CanGrow value="False" /><CanShrink value="False" /><Name value="ReportHeader" /><Location value="{X=0,Y=0}" /><controls /></section><section name="ReportPageHeader"><BackColor value="Color [Window]" /><Size value="{Width=787, Height=80}" /><SectionMargin value="50" /><PageBreakAfter value="False" /><CanGrow value="False" /><CanShrink value="False" /><Name value="ReportPageHeader" /><Location value="{X=0,Y=0}" /><controls><control type="SharpReport.ReportItems.ReportTextItem" basetype="SharpReportCore.BaseTextItem"><Location value="{X=0,Y=0}" /><Font value="Microsoft Sans Serif, 10pt" /><Text value="SharpReport1" /><FormatString value="" /><StringTrimming value="EllipsisCharacter" /><ContentAlignment value="MiddleLeft" /><DrawBorder value="False" /><ForeColor value="Color [ControlText]" /><Visible value="True" /><CanGrow value="False" /><CanShrink value="False" /><Name value="reportTextItem1" /><Size value="{Width=185, Height=24}" /><BackColor value="Color [White]" /></control><control type="SharpReport.ReportItems.ReportDataItem" basetype="SharpReportCore.BaseDataItem"><Size value="{Width=191, Height=24}" /><Location value="{X=267,Y=4}" /><Font value="Microsoft Sans Serif, 8.25pt" /><Text value="unbound" /><ColumnName value="unbound" /><DataType value="" /><BaseTableName value="" /><NullValue value="" /><FormatString value="" /><StringTrimming value="EllipsisCharacter" /><ContentAlignment value="MiddleLeft" /><DrawBorder value="False" /><ForeColor value="Color [ControlText]" /><Visible value="True" /><CanGrow value="False" /><CanShrink value="False" /><Name value="reportDbTextItem1" /><BackColor value="Color [White]" /></control></controls></section><section name="ReportDetail"><BackColor value="Color [Window]" /><Size value="{Width=787, Height=108}" /><SectionMargin value="50" /><PageBreakAfter value="False" /><CanGrow value="False" /><CanShrink value="False" /><Name value="ReportDetail" /><Location value="{X=0,Y=0}" /><controls /></section><section name="ReportPageFooter"><BackColor value="Color [Window]" /><Size value="{Width=787, Height=40}" /><SectionMargin value="50" /><PageBreakAfter value="False" /><CanGrow value="False" /><CanShrink value="False" /><Name value="ReportPageFooter" /><Location value="{X=0,Y=0}" /><controls><control type="SharpReport.ReportItems.Functions.PageNumber" basetype="SharpReportCore.BasePageNumber"><Size value="{Width=120, Height=20}" /><Location value="{X=0,Y=0}" /><Font value="Microsoft Sans Serif, 8.25pt" /><Text value="Seiten Nummer" /><LocalisedName value="SharpReport.Toolbar.Functions.PageNumber" /><FormatString value="" /><StringTrimming value="EllipsisCharacter" /><ContentAlignment value="MiddleLeft" /><DrawBorder value="False" /><ForeColor value="Color [ControlText]" /><Visible value="True" /><CanGrow value="False" /><CanShrink value="False" /><Name value="pageNumber1" /><BackColor value="Color [White]" /></control></controls></section><section name="ReportFooter"><BackColor value="Color [Window]" /><Size value="{Width=787, Height=40}" /><SectionMargin value="50" /><PageBreakAfter value="False" /><CanGrow value="False" /><CanShrink value="False" /><Name value="ReportFooter" /><Location value="{X=0,Y=0}" /><controls /></section></SharpReport>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/MyNamespaceBuilder.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/MyNamespaceBuilder.cs
index 277da41a26..f5fbe70dff 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/MyNamespaceBuilder.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/MyNamespaceBuilder.cs
@@ -22,7 +22,7 @@ namespace VBNetBinding
 		public static void BuildNamespace(IProject project, IProjectContent pc)
 		{
 			ICompilationUnit cu = new DefaultCompilationUnit(pc);
-			cu.FileName = "GeneratedMyNamespace.vb";
+			//cu.FileName = "GeneratedMyNamespace.vb"; // leave FileName null - fixes SD2-854
 			string ns;
 			if (project.RootNamespace == null || project.RootNamespace.Length == 0)
 				ns = "My";
@@ -41,7 +41,7 @@ namespace VBNetBinding
 			}
 			DefaultClass c = new DefaultClass(cu, ns + ".MyProject");
 			c.ClassType = ClassType.Module;
-			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Partial | ModifierEnum.Sealed;
+			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Partial | ModifierEnum.Sealed | ModifierEnum.Synthetic;
 			c.Attributes.Add(new DefaultAttribute("Microsoft.VisualBasic.HideModuleNameAttribute"));
 			
 			// we need to use GetClassReturnType instead of DefaultReturnType because we need
@@ -72,7 +72,7 @@ namespace VBNetBinding
 		{
 			DefaultClass c = new DefaultClass(cu, ns + ".MyApplication");
 			c.ClassType = ClassType.Class;
-			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed | ModifierEnum.Partial;
+			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed | ModifierEnum.Partial | ModifierEnum.Synthetic;
 			c.Attributes.Add(new DefaultAttribute("Microsoft.VisualBasic.HideModuleNameAttribute"));
 			switch (project.OutputType) {
 				case OutputType.WinExe:
@@ -97,7 +97,7 @@ namespace VBNetBinding
 		{
 			DefaultClass c = new DefaultClass(cu, ns + ".MyComputer");
 			c.ClassType = ClassType.Class;
-			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed | ModifierEnum.Partial;
+			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed | ModifierEnum.Partial | ModifierEnum.Synthetic;
 			c.Attributes.Add(new DefaultAttribute("Microsoft.VisualBasic.HideModuleNameAttribute"));
 			c.BaseTypes.Add(CreateBaseType(cu, "Microsoft.VisualBasic.Devices.Computer"));
 			return c;
@@ -107,7 +107,7 @@ namespace VBNetBinding
 		{
 			DefaultClass c = new MyFormsClass(cu, ns + ".MyForms");
 			c.ClassType = ClassType.Class;
-			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed; //| ModifierEnum.Partial;
+			c.Modifiers = ModifierEnum.Internal | ModifierEnum.Sealed | ModifierEnum.Synthetic;
 			c.Attributes.Add(new DefaultAttribute("Microsoft.VisualBasic.HideModuleNameAttribute"));
 			return c;
 		}
@@ -119,14 +119,11 @@ namespace VBNetBinding
 			public override List<IProperty> Properties {
 				get {
 					List<IProperty> properties = new List<IProperty>();
-					IProjectContent pc = ProjectContentRegistry.GetExistingProjectContent(new System.Reflection.AssemblyName("System.Windows.Forms"));
-					if (pc == null)
-						return properties;
-					IClass formClass = pc.GetClass("System.Windows.Forms.Form");
+					IClass formClass = this.ProjectContent.GetClass("System.Windows.Forms.Form");
 					if (formClass == null)
 						return properties;
 					foreach (IClass c in this.ProjectContent.Classes) {
-						if (c.BaseClass == formClass) {
+						if (c.IsTypeInInheritanceTree(formClass)) {
 							properties.Add(new DefaultProperty(c.Name,
 							                                   new GetClassReturnType(this.ProjectContent, c.FullyQualifiedName, 0),
 							                                   ModifierEnum.Public | ModifierEnum.Static,
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
index 0391f67f33..d511069b15 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
@@ -251,7 +251,7 @@ namespace ICSharpCode.FormsDesigner
 				} else if (e is FormsDesignerLoadException) {
 					errorText.Text = e.Message;
 				} else if (!designSurface.IsLoaded && designSurface.LoadErrors != null) {
-					errorText.Text = "Error loading designer:\r\n\r\n";
+					errorText.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.FormDesigner.ErrorLoadingDesigner}\r\n\r\n");
 					foreach(Exception le in designSurface.LoadErrors) {
 						errorText.Text += le.ToString();
 						errorText.Text += "\r\n";
@@ -263,7 +263,7 @@ namespace ICSharpCode.FormsDesigner
 				errorText.Dock = DockStyle.Fill;
 				p.Controls.Add(errorText);
 				Control title = new Label();
-				title.Text = "Failed to load designer. Check the source code for syntax errors and check if all references are available.";
+				title.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.FormDesigner.LoadErrorCheckSourceCodeForErrors}");
 				title.Dock = DockStyle.Top;
 				p.Controls.Add(title);
 			}
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.cs
index 494c0c5295..77e4c3a4a7 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.cs
@@ -28,19 +28,23 @@ namespace ICSharpCode.SharpDevelop.Services
 		private ExceptionForm()
 		{
 			InitializeComponent();
+			this.Text = StringParser.Parse(this.Text);
+			buttonContinue.Text = StringParser.Parse(buttonContinue.Text);
+			buttonIgnore.Text = StringParser.Parse(buttonIgnore.Text);
+			buttonBreak.Text = StringParser.Parse(buttonBreak.Text);
 		}
 		
 		public static Result Show(Debugger.Exception exception)
 		{
-			ExceptionForm form = new ExceptionForm();
-			form.textBox.Text = "Exception " + 
-			                    exception.Type +
-			                    " was thrown in debugee:\r\n" +
-			                    exception.Message + "\r\n\r\n" +
-								exception.Callstack.Replace("\n","\r\n");
-			form.pictureBox.Image = ResourceService.GetBitmap((exception.ExceptionType != ExceptionType.DEBUG_EXCEPTION_UNHANDLED)?"Icons.32x32.Warning":"Icons.32x32.Error");
-			form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
-			return form.result;
+			using (ExceptionForm form = new ExceptionForm()) {
+				form.textBox.Text =
+					ResourceService.GetString("MainWindow.Windows.Debug.ExceptionForm.Message").Replace("{0}", exception.Type) + "\r\n" +
+					exception.Message + "\r\n\r\n" +
+					exception.Callstack.Replace("\n","\r\n");
+				form.pictureBox.Image = ResourceService.GetBitmap((exception.ExceptionType != ExceptionType.DEBUG_EXCEPTION_UNHANDLED)?"Icons.32x32.Warning":"Icons.32x32.Error");
+				form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+				return form.result;
+			}
 		}
 		
 		#region Windows Forms Designer generated code
@@ -65,7 +69,7 @@ namespace ICSharpCode.SharpDevelop.Services
 			this.buttonBreak.Name = "buttonBreak";
 			this.buttonBreak.Size = new System.Drawing.Size(91, 32);
 			this.buttonBreak.TabIndex = 0;
-			this.buttonBreak.Text = "Break";
+			this.buttonBreak.Text = "${res:XML.MainMenu.DebugMenu.Break}";
 			this.buttonBreak.Click += new System.EventHandler(this.buttonBreak_Click);
 			// 
 			// pictureBox
@@ -80,12 +84,12 @@ namespace ICSharpCode.SharpDevelop.Services
 			// buttonIgnore
 			// 
 			this.buttonIgnore.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-			this.buttonIgnore.Enabled = true;
+			this.buttonIgnore.DialogResult = System.Windows.Forms.DialogResult.Cancel;
 			this.buttonIgnore.Location = new System.Drawing.Point(372, 160);
 			this.buttonIgnore.Name = "buttonIgnore";
 			this.buttonIgnore.Size = new System.Drawing.Size(91, 32);
 			this.buttonIgnore.TabIndex = 2;
-			this.buttonIgnore.Text = "Ignore";
+			this.buttonIgnore.Text = "${res:Global.IgnoreButtonText}";
 			this.buttonIgnore.Click += new System.EventHandler(this.buttonIgnore_Click);
 			// 
 			// buttonContinue
@@ -95,26 +99,26 @@ namespace ICSharpCode.SharpDevelop.Services
 			this.buttonContinue.Name = "buttonContinue";
 			this.buttonContinue.Size = new System.Drawing.Size(91, 32);
 			this.buttonContinue.TabIndex = 1;
-			this.buttonContinue.Text = "Continue";
+			this.buttonContinue.Text = "${res:ICSharpCode.SharpDevelop.ExceptionBox.Continue}";
 			this.buttonContinue.Click += new System.EventHandler(this.buttonContinue_Click);
 			// 
-			// label
+			// textBox
 			// 
 			this.textBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
+			                                                             | System.Windows.Forms.AnchorStyles.Left)
+			                                                            | System.Windows.Forms.AnchorStyles.Right)));
 			this.textBox.Location = new System.Drawing.Point(91, 16);
-			this.textBox.Name = "textBox";
 			this.textBox.Multiline = true;
-			this.textBox.WordWrap = false;
+			this.textBox.Name = "textBox";
 			this.textBox.ReadOnly = true;
+			this.textBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
 			this.textBox.Size = new System.Drawing.Size(528, 138);
 			this.textBox.TabIndex = 4;
-			this.textBox.Text = "";
-			this.textBox.ScrollBars = ScrollBars.Both;
+			this.textBox.WordWrap = false;
 			// 
 			// ExceptionForm
 			// 
+			this.CancelButton = this.buttonIgnore;
 			this.ClientSize = new System.Drawing.Size(638, 203);
 			this.Controls.Add(this.textBox);
 			this.Controls.Add(this.pictureBox);
@@ -125,27 +129,27 @@ namespace ICSharpCode.SharpDevelop.Services
 			this.MinimizeBox = false;
 			this.Name = "ExceptionForm";
 			this.ShowInTaskbar = false;
-			this.Text = "Exception";
+			this.Text = "${res:MainWindow.Windows.Debug.ExceptionHistory.Exception}";
 			this.TopMost = true;
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
 			this.ResumeLayout(false);
-
+			this.PerformLayout();
 		}
 		#endregion
 
-		private void buttonBreak_Click(object sender, System.EventArgs e) 
+		private void buttonBreak_Click(object sender, System.EventArgs e)
 		{
 			result = Result.Break;
 			Close();
 		}
 
-		private void buttonContinue_Click(object sender, System.EventArgs e) 
+		private void buttonContinue_Click(object sender, System.EventArgs e)
 		{
 			result = Result.Continue;
 			Close();
 		}
 
-		private void buttonIgnore_Click(object sender, System.EventArgs e) 
+		private void buttonIgnore_Click(object sender, System.EventArgs e)
 		{
 			result = Result.Ignore;
 			Close();
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.resx b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.resx
index 3a3c6fa757..7080a7d118 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.resx
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/ExceptionForm.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -71,6 +72,7 @@
               <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -88,6 +90,7 @@
               <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs
index 60ec30a434..bb772f4405 100644
--- a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs
@@ -100,7 +100,7 @@ namespace SharpReport{
 						} catch (Exception ) {
 							throw;
 						} finally {
-							System.Console.WriteLine("ReportManager:ReadColumnCollection in finally");
+//							System.Console.WriteLine("ReportManager:ReadColumnCollection in finally");
 						}
 					}
 					break;
@@ -189,26 +189,31 @@ namespace SharpReport{
 		/// <param name="model"><see cref="">ReportModel</see></param>
 		/// <param name="showInUserControl"></param>
 		public void ReportPreview (ReportModel model,bool standAlone) {
+			System.Console.WriteLine("Manager:ReportPreview");
 			if (model == null) {
 				throw new ArgumentNullException("model");
 			}
 			
 			try {
 				AbstractRenderer abstr = this.BuildStandartRenderer (model);
+
 				if (abstr != null) {
 					PreviewControl.ShowPreview (abstr,1.5,standAlone);
 				}
 				
-			} catch (Exception ) {
-				throw;
+			} catch (Exception e) {
+				MessageService.ShowError (e,"SharpReportManager:ReportPreview");
 			}
 		}
 		
+		
+		
 		private AbstractRenderer BuildStandartRenderer (ReportModel model) {
+			System.Console.WriteLine("Manager:BuildStandartRenderr");
+			
 			if (model == null) {
 				throw new ArgumentNullException("model");
 			}
-			
 			if (base.ConnectionObject == null) {
 				base.ConnectionObject = this.BuildConnectionObject(model.ReportSettings);
 			}
@@ -240,7 +245,6 @@ namespace SharpReport{
 			try {
 				AbstractRenderer abstr = GetRendererForPushDataReports (model,dataSet);
 				if (abstr != null) {
-					
 					PreviewControl.ShowPreview (abstr,1.5,standAlone);
 				}
 				
diff --git a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs
index 56eeb4c64f..b5b9c0e1ce 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs
@@ -568,7 +568,12 @@ namespace SharpReportAddin{
 					                                                       SharpReportView.DataSetFromFile());
 					
 				} else {
-					renderer = reportManager.GetRendererForStandartReports(this.designerControl.ReportModel);
+					try {
+						renderer = reportManager.GetRendererForStandartReports(this.designerControl.ReportModel);
+					} catch (Exception e) {
+						MessageService.ShowError (e,"SharpReportManager:ReportPreview");
+						return null;
+					}
 				}
 				return renderer.ReportDocument;
 			}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportObject.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportObject.cs
index 5a653dc8e4..afde2f7211 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportObject.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportObject.cs
@@ -33,8 +33,8 @@ namespace SharpReportCore {
 		private bool visible = true;
 		private bool  canGrow ;
 		private bool canShrink ;
-		private bool pageBreakBefore;
-		private bool pageBreakAfter;
+
+		
 		private bool suspend;
 		private Size size;
 		private Point location;
@@ -44,7 +44,9 @@ namespace SharpReportCore {
 		
 		
 		#region SharpReportCore.IPropertyChange interface implementation
+		
 		public event PropertyChangedEventHandler PropertyChanged;
+		
 		#endregion
 		
 		public BaseReportObject() {
@@ -68,6 +70,7 @@ namespace SharpReportCore {
 		}
 		
 		#region properties
+		
 		public virtual bool Visible {
 			get {
 				return visible;
@@ -109,26 +112,6 @@ namespace SharpReportCore {
 			}
 		}
 		
-		public virtual bool PageBreakAfter {
-			get {
-				return pageBreakAfter;
-			}
-			set {
-				pageBreakAfter = value;
-				NotifyPropertyChanged ("PageBreakAfter");
-			}
-		}
-		
-		
-		public virtual bool PageBreakBefore {
-			get {
-				return pageBreakBefore;
-			}
-			set {
-				pageBreakBefore = value;
-				NotifyPropertyChanged ("PageBreakBefore");
-			}
-		}
 		
 		
 		
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseSection.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseSection.cs
index a49237e4c1..e3560c0128 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseSection.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseSection.cs
@@ -21,47 +21,54 @@ namespace SharpReportCore {
 	public class BaseSection : SharpReportCore.BaseReportObject {
 		
 		private int sectionMargin;
+//		private bool pageBreakBefore;
+		private bool pageBreakAfter;
 		
 		private ReportItemCollection items;
 		
-		public event EventHandler<SectionPrintingEventArgs> SectionPrinting;
-		public event EventHandler<SectionPrintingEventArgs> SectionPrinted;
+		public event EventHandler<SectionEventArgs> SectionPrinting;
+		public event EventHandler<SectionEventArgs> SectionPrinted;
 		
 		
 		#region Constructors
 		
 		public BaseSection(): base() {
-			this.Name = String.Empty;
+			base.Name = String.Empty;
 		}
 		
 		public BaseSection (string sectionName) :base(){
-			this.Name = sectionName;
+			base.Name = sectionName;
 		}
 		
 		#endregion
 		
+		#region Rendering
+		
 		public override void Render(ReportPageEventArgs rpea){
 			this.NotifyPrinting();
 			base.Render(rpea);
 			this.NotifyPrinted();
 		}
 		
-		
-		#region properties
-		public void NotifyPrinting () {
+		private void NotifyPrinting () {
 			if (this.SectionPrinting != null) {
-				SectionPrintingEventArgs ea = new SectionPrintingEventArgs (this);
+				SectionEventArgs ea = new SectionEventArgs (this);
 				SectionPrinting (this,ea);
-			}
+			} 
 		}
 		
-		public void NotifyPrinted () {
+		private void NotifyPrinted () {
 			if (this.SectionPrinted != null) {
-				SectionPrintingEventArgs ea = new SectionPrintingEventArgs (this);
+				SectionEventArgs ea = new SectionEventArgs (this);
 				SectionPrinted (this,ea);
 			}
 		}
 		
+		#endregion
+		
+		#region properties
+		
+		
 		public  int SectionMargin {
 			get {
 				return this.sectionMargin;
@@ -82,6 +89,29 @@ namespace SharpReportCore {
 				return items;
 			}
 		}
+		
+		/*
+		public virtual bool PageBreakBefore {
+			get {
+				return pageBreakBefore;
+			}
+			set {
+				pageBreakBefore = value;
+				NotifyPropertyChanged ("PageBreakBefore");
+			}
+		}
+		*/
+		public virtual bool PageBreakAfter {
+			get {
+				return pageBreakAfter;
+			}
+			set {
+				pageBreakAfter = value;
+				NotifyPropertyChanged ("PageBreakAfter");
+			}
+		}
+		
+		
 		#endregion
 		
 		#region System.IDisposable interface implementation
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/ConnectionObject.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/ConnectionObject.cs
index ed3296af4b..06ead7e636 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/ConnectionObject.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/ConnectionObject.cs
@@ -36,6 +36,9 @@ namespace SharpReportCore {
 		}
 		
 		public ConnectionObject( OleDbConnectionStringBuilder oleDbConnectionStringBuilder){
+			if (oleDbConnectionStringBuilder == null) {
+				throw new ArgumentNullException("oleDbConnectionStringBuilder");
+			}
 			this.oleDbConnectionStringBuilder = oleDbConnectionStringBuilder;
 			try {
 				this.connection = new OleDbConnection (this.oleDbConnectionStringBuilder.ConnectionString);
@@ -45,6 +48,9 @@ namespace SharpReportCore {
 		}
 		
 		public ConnectionObject(IDbConnection connection){
+			if (connection == null) {
+				throw new ArgumentNullException("connection");
+			}
 			this.connection = connection;
 			this.connectionString = this.connection.ConnectionString;
 		}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs
index 44e112865d..f9cc8c89a6 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs
@@ -32,11 +32,8 @@ namespace SharpReportCore {
 		ConnectionObject connectionObject;
 		IDbConnection connection;
 		IDataViewStrategy dataViewStrategy;
-		GroupSeperator groupSeperator;
 		
 		public event EventHandler <ListChangedEventArgs> ListChanged;
-//		public event EventHandler <GroupChangedEventArgs> GroupChanged;
-//		public event EventHandler <EventArgs> GroupChanging;
 		
 		/// <summary>
 		/// use this Constructor for PullDataReports
@@ -53,16 +50,25 @@ namespace SharpReportCore {
 			if (reportSettings == null) {
 				throw new ArgumentNullException("reportSettings");
 			}
+			try {
+				this.connectionObject = connectionObject;
+				CheckConnection (this.connectionObject);
+				
+				CheckReportSettings(reportSettings);
+				CheckDataSource(this.FillDataSet().Tables[0]);
 
-			this.connectionObject = connectionObject;
-			CheckConnection (this.connectionObject);
-			CheckReportSettings(reportSettings);
-			CheckDataSource(this.FillDataSet().Tables[0]);
-
-			this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
-			                                          reportSettings);
-			this.dataViewStrategy.ListChanged += new EventHandler <ListChangedEventArgs> (NotifyListChanged);
+				this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
+				                                          reportSettings);
+				this.dataViewStrategy.ListChanged += new EventHandler <ListChangedEventArgs> (NotifyListChanged);
 //			this.dataViewStrategy.GroupChanged += new EventHandler<GroupChangedEventArgs> (OnGroupChange);
+			}
+			catch (Exception) {
+				throw;
+			} finally {
+				if (this.connectionObject.Connection.State == ConnectionState.Open) {
+					this.connectionObject.Connection.Close();
+				}
+			}
 		}
 		
 		public DataManager(DataTable dataSource, ReportSettings reportSettings){
@@ -118,11 +124,13 @@ namespace SharpReportCore {
 		void CheckReportSettings(ReportSettings settings) {
 			try {
 				if (settings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
-					SqlQueryChecker checker = new SqlQueryChecker();
-					checker.Check(settings.CommandText);
+					SqlQueryChecker.Check(settings.CommandText);
 				}
 				
-			} catch (Exception) {
+			} catch (IllegalQueryException) {
+				throw;
+			}
+			catch (Exception) {
 				throw;
 			}
 			this.reportSettings = settings;
@@ -199,16 +207,19 @@ namespace SharpReportCore {
 				if (this.connection.State == ConnectionState.Closed) {
 					this.connection.Open();
 				}
-				
+
 				OleDbCommand command = ((OleDbConnection)this.connection).CreateCommand();
 				command.CommandText = reportSettings.CommandText;
 				command.CommandType = reportSettings.CommandType;
 				// We have to check if there are parameters for this Query, if so
 				// add them to the command
 				
-				CheckForAndBuildParams(command,reportSettings);
+				BuildQueryParameters(command,reportSettings);
+				
 				OleDbDataAdapter adapter = new OleDbDataAdapter(command);
+				
 				DataSet ds = new DataSet();
+				
 				ds.Locale = CultureInfo.CurrentCulture;
 				adapter.Fill (ds);
 				return ds;
@@ -222,7 +233,7 @@ namespace SharpReportCore {
 		}
 		
 		
-		private static void CheckForAndBuildParams (OleDbCommand cmd,ReportSettings reportSettings) {
+		private static void BuildQueryParameters (OleDbCommand cmd,ReportSettings reportSettings) {
 			if (reportSettings.SqlParametersCollection != null && reportSettings.SqlParametersCollection.Count > 0) {
 				SqlParameter rpPar;
 				OleDbParameter oleDBPar = null;
@@ -287,7 +298,6 @@ namespace SharpReportCore {
 		}
 		
 		private void OnGroupChange (object sender,GroupChangedEventArgs e) {
-			this.groupSeperator = e.GroupSeperator;
 			this.NotifyGroupChanging();
 		}
 		#endregion
@@ -311,56 +321,7 @@ namespace SharpReportCore {
 				return this.dataSource;
 			}
 		}
-		/*
-		public int CurrentRow {
-			get {
-				return this.dataViewStrategy.CurrentRow;
-			}
-		}
-		*/
-		/*
-		public int Count {
-			get {
-				return this.dataViewStrategy.Count;
-			}
-		}
-		*/
-		/*
-		public bool HasMoreData {
-			get {
-				if (this.dataViewStrategy.CurrentRow < this.dataViewStrategy.Count ){
-					return true;
-				} else {
-					return false;
-				}
-			}
-		}
-		
-		*/
-		
-		
-//		public void Skip() {
-//			this.dataViewStrategy.CurrentRow ++;
-//		}
-//		
-		/*
-		public void FetchData(ReportItemCollection collection) {
-			foreach (IItemRenderer item in collection) {
-				this.dataViewStrategy.Fill(item);
-			}
-			this.NotifyGroupChanged();
-		}
-		*/
-		/*
-		/// <summary>
-		/// Indicate's if the current <see cref="GroupSeperator"></see> has ChildRows
-		/// </summary>
-		public bool HasChilds {
-			get {
-				return this.dataViewStrategy.HasChilds;
-			}
-		}
-		*/
+	
 		
 		/// <summary>
 		/// Returns a <see cref="SharpArrayList"></see>, be carefull, this list is only a Indexlist
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/SqlQueryChecker.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/SqlQueryChecker.cs
index 73e49ff414..116eb73c38 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/SqlQueryChecker.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/SqlQueryChecker.cs
@@ -11,44 +11,23 @@ using System;
 using System.Globalization;
 using System.Windows.Forms;
 
-namespace SharpReportCore
-{
+namespace SharpReportCore{
 	/// <summary>
 	/// This Class checks for invalid SqlStatements
 	/// </summary>
 	internal class SqlQueryChecker{
-		internal string UPDATE = "UPDATE";
-		internal string DELETE = "DELETE";
-		internal string INSERT = "INSERT";
-		internal string noValidMessage = "is no valid Member of SqlString";
+		internal string noValidMessage = "Query should start with 'Select'";
 		
-		
-		public SqlQueryChecker(){
+		private SqlQueryChecker () {
 		}
 		
-		public void Check (string queryString) {
+		public static void Check (string queryString) {
 			if (!String.IsNullOrEmpty(queryString)) {
 				queryString = queryString.ToUpper(CultureInfo.CurrentCulture);
-				
-				if (queryString.IndexOf (this.UPDATE) > -1) {
-					this.Invalid (this.UPDATE);
-				}
-				
-				if (queryString.IndexOf(this.DELETE) > -1)  {
-					this.Invalid (this.DELETE);
-				}
-				
-				if (queryString.IndexOf(this.INSERT) > -1)  {
-					this.Invalid (this.INSERT);
+				if (queryString.IndexOf("SELECT") < 0) {
+					throw new SharpReportCore.IllegalQueryException();
 				}
 			}
 		}
-		
-		private void Invalid (string invalidArgument) {
-			
-			string str = String.Format(CultureInfo.CurrentCulture,
-			                           "{0} {1}",invalidArgument,this.noValidMessage);
-			throw new SharpReportCore.SharpReportException(str);
-		}
 	}
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Events/PrintEventArgs.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/PrintEventArgs.cs
index 753970523c..9a91f95cdb 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Events/PrintEventArgs.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/PrintEventArgs.cs
@@ -23,10 +23,10 @@ using System.Drawing;
 	
 namespace SharpReportCore {
 	
-	public class SectionPrintingEventArgs : System.EventArgs {
+	public class SectionEventArgs : System.EventArgs {
 		BaseSection section;
 		
-		public SectionPrintingEventArgs(BaseSection section){
+		public SectionEventArgs(BaseSection section){
 			this.section = section;
 		}
 		
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Events/ReportPageEventArgs.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/ReportPageEventArgs.cs
index a6f0507bcb..eaf4abca17 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Events/ReportPageEventArgs.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/ReportPageEventArgs.cs
@@ -30,6 +30,7 @@ namespace SharpReportCore {
 		PrintPageEventArgs printEventArgs;
 		int pageNumber;
 		bool forceNewPage;
+		
 		PointF locationAfterDraw;
 		
 		public ReportPageEventArgs(PrintPageEventArgs e,
@@ -49,6 +50,8 @@ namespace SharpReportCore {
 				return pageNumber;
 			}
 		}
+		
+		
 		public PrintPageEventArgs PrintPageEventArgs {
 			get {
 				return printEventArgs;
@@ -62,6 +65,8 @@ namespace SharpReportCore {
 				forceNewPage = value;
 			}
 		}
+		
+		
 		public PointF LocationAfterDraw {
 			get {
 				return locationAfterDraw;
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Events/SectionRenderEventArgs.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/SectionRenderEventArgs.cs
new file mode 100644
index 0000000000..fa638595c4
--- /dev/null
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Events/SectionRenderEventArgs.cs
@@ -0,0 +1,52 @@
+/*
+ * Created by SharpDevelop.
+ * User: Forstmeier Helmut
+ * Date: 20.06.2006
+ * Time: 13:07
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+
+namespace SharpReportCore {
+	/// <summary>
+	/// Description of SectionRenderEventArgs.
+	/// </summary>
+	
+	public class SectionRenderEventArgs:SectionEventArgs{
+		private int pageNumber;
+		private int rowNumber;
+		private GlobalEnums.enmSection currentSection;
+		
+		public SectionRenderEventArgs(BaseSection section,
+		                              int pageNumber,int rowNumber,
+		                              GlobalEnums.enmSection currentSection):base(section){
+		                             
+			this.pageNumber = pageNumber;
+			this.currentSection = currentSection;
+			this.rowNumber = rowNumber;
+		}
+		
+		public int PageNumber {
+			get {
+				return pageNumber;
+			}
+		}
+		
+		
+		public int RowNumber {
+			get {
+				return rowNumber;
+			}
+		}
+		
+		
+		public SharpReportCore.GlobalEnums.enmSection CurrentSection {
+			get {
+				return currentSection;
+			}
+		}
+		
+	}
+}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/IllegalQueryException.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/IllegalQueryException.cs
new file mode 100644
index 0000000000..78abf33f7e
--- /dev/null
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/IllegalQueryException.cs
@@ -0,0 +1,50 @@
+/*
+ * Created by SharpDevelop.
+ * User: Forstmeier Helmut
+ * Date: 15.06.2006
+ * Time: 17:53
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.Runtime.Serialization;
+namespace SharpReportCore
+{
+	/// <summary>
+	/// IllegalQueryException is thrown when a QueryString contains other statements as
+	/// Select. So it should not happen do alter a Database while doing a Query with SharpReport
+	/// </summary>
+	public class IllegalQueryException: System.Exception{
+		private const  string message = "Query should start with 'Select'";
+		
+		string errorMessage;
+		
+		public IllegalQueryException():base(message){
+			
+		}
+		public IllegalQueryException(string errorMessage) :base (errorMessage){
+			this.errorMessage = errorMessage;
+		}
+		public IllegalQueryException(string errorMessage,
+		                            Exception exception):base (errorMessage,exception){
+			
+		}
+		
+		protected IllegalQueryException(SerializationInfo info,
+         StreamingContext context) : base(info, context){
+         // Implement type-specific serialization constructor logic.
+      	}
+		
+		public string ErrorMessage {
+			get {
+				if (String.IsNullOrEmpty(this.errorMessage)) {
+					return IllegalQueryException.message;
+				} else {
+					return this.errorMessage;
+				}
+			}
+		}
+		
+	}
+}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/SharpReportException.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/SharpReportException.cs
index 4b726db787..cc7611f707 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/SharpReportException.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/SharpReportException.cs
@@ -41,13 +41,11 @@ namespace SharpReportCore {
          StreamingContext context) : base(info, context){
          // Implement type-specific serialization constructor logic.
       	}
+		
 		public string ErrorMessage {
 			get {
 				return errorMessage;
 			}
-			set {
-				errorMessage = value;
-			}
 		}
 	}
 
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractDataRenderer.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractDataRenderer.cs
index 173608ddcb..d1875d244f 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractDataRenderer.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractDataRenderer.cs
@@ -9,15 +9,14 @@
 
 using System;
 using System.Drawing;
-
+using System.Drawing.Printing;
 namespace SharpReportCore{
 	/// <summary>
 	/// Description of AbstractDataRenderer.
 	/// </summary>
 	public class AbstractDataRenderer : AbstractRenderer{
 		DataManager dataManager;
-		DataNavigator navigator;
-		
+		DataNavigator dataNavigator;
 		
 		public AbstractDataRenderer(ReportModel model,DataManager dataManager):base(model){
 			if (dataManager == null) {
@@ -26,22 +25,22 @@ namespace SharpReportCore{
 			this.dataManager = dataManager;
 		}
 		
-		protected override void ReportBegin(object sender, ReportPageEventArgs e){
-			base.ReportBegin(sender, e);
+		#region overrides
+		protected override void ReportBegin(object sender, PrintEventArgs pea){
+			base.ReportBegin(sender, pea);
 		}
 		
 		
 		
-		protected override void BeginPrintPage(object sender, ReportPageEventArgs e)
-		{
-			base.BeginPrintPage(sender, e);
+		protected override int RenderSection(ReportPageEventArgs rpea){
+			return 0;
 		}
 		
-		
-		protected override int RenderSection(BaseSection section, ReportPageEventArgs rpea){
-			bool hasContainer = false;
+		#endregion
+		protected int DoItems (ReportPageEventArgs rpea) {
 			IContainerItem container = null;
-			foreach (BaseReportItem item in section.Items) {
+			bool hasContainer = false;
+			foreach (BaseReportItem item in this.CurrentSection.Items) {
 				container = item as IContainerItem;
 				if (container != null) {
 					hasContainer = true;
@@ -49,13 +48,13 @@ namespace SharpReportCore{
 				}
 			}
 			if (hasContainer) {
-				return DoContainerControl(section,container,rpea);
+				return DoContainerControl(this.CurrentSection,container,rpea);
 			} else {
-				return base.RenderSection(section, rpea);
+				return base.RenderSection(rpea);
 			}
-
 		}
 		
+		
 		private int DoContainerControl (BaseSection section,
 		                                IContainerItem container,
 		                                ReportPageEventArgs rpea) {
@@ -95,23 +94,25 @@ namespace SharpReportCore{
 		}
 		
 		protected DataNavigator DataNavigator{
-			get {return this.navigator;}
-			set {this.navigator = value;}
+			get {return this.dataNavigator;}
+			set {this.dataNavigator = value;}
 		}
 		
 		#endregion
 		
 		#region IDisposable
-		public override void Dispose()
-		{
-			if (this.dataManager != null) {
-				this.dataManager.Dispose();
-				this.dataManager = null;
-			}
-			if (this.navigator != null) {
-				this.navigator= null;
+		public new void Dispose(){
+			try {
+				if (this.dataManager != null) {
+					this.dataManager.Dispose();
+					this.dataManager = null;
+				}
+				if (this.dataNavigator != null) {
+					this.dataNavigator= null;
+				}
+			} finally {
+				base.Dispose();
 			}
-			base.Dispose();
 		}
 		#endregion
 	}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs
index fbdfd83c11..886a31c686 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs
@@ -3,20 +3,7 @@
 //
 // Copyright (C) 2005 Peter Forstmeier
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
+
 // Peter Forstmeier (Peter.Forstmeier@t-online.de)
 
 
@@ -51,8 +38,10 @@ namespace SharpReportCore {
 		private Point detailEnds;
 	
 		private DefaultFormatter defaultFormatter;
-		private bool cancel;
+		private bool cancel;		
 		
+		public event EventHandler<SectionRenderEventArgs> SectionRendering;
+		public event EventHandler<SectionRenderEventArgs> SectionRendered;
 		
 		protected AbstractRenderer(ReportModel model){
 			if (model == null) {
@@ -70,24 +59,107 @@ namespace SharpReportCore {
 		
 		void Init() {
 			reportDocument = new SharpReportCore.ReportDocument();
+			reportDocument.DocumentName = reportSettings.ReportName;
 			
-			reportDocument.QueryPage += new QueryPageSettingsEventHandler (ReportQueryPage);
+			// Events from ReportDocument
+			reportDocument.QueryPageSettings += new QueryPageSettingsEventHandler (ReportQueryPage);
+			reportDocument.BeginPrint += new PrintEventHandler(ReportBegin);
+			reportDocument.EndPrint += new PrintEventHandler(ReportEnd);
 			
-			reportDocument.ReportBegin += new EventHandler<ReportPageEventArgs> (ReportBegin);
-			reportDocument.PrintPageBegin +=  new EventHandler<ReportPageEventArgs>(BeginPrintPage);
-			reportDocument.PrintPageBodyStart += new EventHandler<ReportPageEventArgs> (PrintBodyStart);
-			reportDocument.PrintPageBodyEnd += new EventHandler<ReportPageEventArgs> (PrintBodyEnd);
-			reportDocument.PrintPageEnd += new EventHandler<ReportPageEventArgs> (PrintPageEnd);
-			reportDocument.DocumentName = reportSettings.ReportName;
+			// homemade events
+			reportDocument.PrintPageBodyStart += new EventHandler<ReportPageEventArgs> (BodyStart);
+			
+			reportDocument.PrintPageBodyEnd += new EventHandler<ReportPageEventArgs> (OnBodyEnd);
+
+			//
+			reportDocument.RenderReportHeader += new EventHandler<ReportPageEventArgs> (PrintReportHeader);
+			reportDocument.RenderPageHeader += new EventHandler<ReportPageEventArgs> (PrintPageHeader);
+			reportDocument.RenderDetails += new EventHandler<ReportPageEventArgs> (PrintDetail);
+			reportDocument.RenderPageEnd += new EventHandler<ReportPageEventArgs> (PrintPageEnd);
+			reportDocument.RenderReportEnd += new EventHandler<ReportPageEventArgs> (PrintReportFooter);
+		}
+		#region Event handling for SectionRendering
+		
+		protected void AddSectionEvents () {
+			this.CurrentSection.SectionPrinting += new EventHandler<SectionEventArgs>(OnSectionPrinting);
+			this.CurrentSection.SectionPrinted += new EventHandler<SectionEventArgs>(OnSectionPrinted);
+		}
+		
+		
+		protected void RemoveSectionEvents () {
+			this.CurrentSection.SectionPrinting -= new EventHandler<SectionEventArgs>(OnSectionPrinting);
+			this.CurrentSection.SectionPrinted -= new EventHandler<SectionEventArgs>(OnSectionPrinted);
+		}
+		
+		
+		private  void OnSectionPrinting (object sender,SectionEventArgs e) {
+			if (this.SectionRendering != null) {
+				SectionRenderEventArgs ea = new SectionRenderEventArgs (e.Section,
+				                                                        this.reportDocument.PageNumber,0,
+				                                                        (GlobalEnums.enmSection)this.sectionInUse);
+				this.SectionRendering(this,ea);
+			} 
+		}
+		
+		
+		private void OnSectionPrinted (object sender,SectionEventArgs e) {
+			if (this.SectionRendered != null) {
+				SectionRenderEventArgs ea = new SectionRenderEventArgs (e.Section,
+				                                                        this.reportDocument.PageNumber,0,
+				                                                        (GlobalEnums.enmSection)this.sectionInUse);
+				this.SectionRendered(this,ea);
+			}
+		}
+		
+		#endregion
+		
+		protected virtual void PrintReportHeader (object sender, ReportPageEventArgs e) {
+			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportHeader,
+			                               CultureInfo.InvariantCulture);
+			this.AddSectionEvents();
 		}
 		
-		protected void PageBreak(ReportPageEventArgs pea, BaseSection sec) {
+		protected virtual void PrintPageHeader (object sender, ReportPageEventArgs e) {
+			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageHeader,
+			                               CultureInfo.InvariantCulture);
+			this.AddSectionEvents();
+		}
+		
+		protected virtual void  PrintDetail (object sender,ReportPageEventArgs rpea) {
+			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,
+			                               CultureInfo.InvariantCulture);
+			this.AddSectionEvents();
+//			System.Console.WriteLine("\tAbstract - PrintDetail");
+		}
+		
+		protected virtual void  PrintPageEnd (object sender,ReportPageEventArgs rpea) {	
+			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageFooter,
+			                               CultureInfo.InvariantCulture);
+//			System.Console.WriteLine("\tAbstract:PrintPageEnd");
+			this.AddSectionEvents();
+
+		}
+		protected virtual void  PrintReportFooter (object sender,ReportPageEventArgs rpea) {	
+			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportFooter,
+			                               CultureInfo.InvariantCulture);
+//			System.Console.WriteLine("\tAbstract:PrintReportFooter");
+			this.AddSectionEvents();
+		}
+		
+		protected static void PageBreak(ReportPageEventArgs pea) {
+			if (pea == null) {
+				throw new ArgumentNullException("pea");
+			}
 			pea.PrintPageEventArgs.HasMorePages = true;
 			pea.ForceNewPage = true;
-			sec.PageBreakBefore = false;
 		}
-
 		
+		protected bool CheckPageBreakAfter () {
+			if (this.CurrentSection.PageBreakAfter) {
+				return true;
+			}
+			return false;
+		}
 		protected int CalculateDrawAreaHeight(ReportPageEventArgs rpea){
 			if (rpea == null) {
 				throw new ArgumentNullException("rpea");
@@ -108,38 +180,42 @@ namespace SharpReportCore {
 		/// Use this function to draw controlling rectangles
 		/// </summary>	
 		
-		protected void DebugRectangle (ReportPageEventArgs rpea,Rectangle rectangle) {
+		protected static void DebugRectangle (ReportPageEventArgs rpea,Rectangle rectangle) {
 			if (rpea == null) {
 				throw new ArgumentNullException("rpea");
 			}
-			
-//			System.Console.WriteLine("Debug Rectangle {0}",rectangle);
 			rpea.PrintPageEventArgs.Graphics.DrawRectangle (Pens.Black,rectangle);
-	
 		}
 		
 		/// <summary>
 		/// Calculates the rectangle wich can be used by Detail
 		/// </summary>
 		/// <returns></returns>
-		protected Rectangle DetailRectangle (ReportPageEventArgs e) {
-			sectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,CultureInfo.InvariantCulture);
+		protected Rectangle DetailRectangle (ReportPageEventArgs rpea) {
+			if (rpea == null) {
+				throw new ArgumentNullException("rpea");
+			}
+			sectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,
+			                               CultureInfo.InvariantCulture);
 			
-			Rectangle rect = new Rectangle (e.PrintPageEventArgs.MarginBounds.Left,
-			                                CurrentSection.SectionOffset ,
-			                                e.PrintPageEventArgs.MarginBounds.Width,
+			Rectangle rect = new Rectangle (rpea.PrintPageEventArgs.MarginBounds.Left,
+			                               this.detailStart.Y ,
+			                                rpea.PrintPageEventArgs.MarginBounds.Width,
 			                                detailEnds.Y - detailStart.Y - (3 * gap));
 			return rect;
 		}
 		
-		protected PointF MeasureReportHeader (ReportPageEventArgs e) {
+		protected PointF MeasureReportHeader (ReportPageEventArgs rpea) {
+			if (rpea == null) {
+				throw new ArgumentNullException("rpea");
+			}
 			PointF endAt = new PointF();
-			if (e.PageNumber == 1) {
+			if (rpea.PageNumber == 1) {
 				sectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportHeader,
 				                               CultureInfo.InvariantCulture);
 				if (this.CurrentSection.Items.Count > 0) {
 					this.CurrentSection.SectionOffset = reportSettings.DefaultMargins.Top;
-					FitSectionToItems (this.CurrentSection,e);
+					FitSectionToItems (this.CurrentSection,rpea);
 					endAt = new PointF (0,
 			                   reportSettings.DefaultMargins.Top + this.CurrentSection.Size.Height + Gap);
 				} else {
@@ -154,18 +230,20 @@ namespace SharpReportCore {
 		///</summary>
 		/// <param name="startAt">Section start at this PointF</param>
 		/// <param name="e">ReportPageEventArgs</param>
-		protected PointF MeasurePageHeader (PointF startat,ReportPageEventArgs e) {
-
+		protected PointF MeasurePageHeader (PointF startat,ReportPageEventArgs rpea) {
+			if (rpea == null) {
+				throw new ArgumentNullException("rpea");
+			}
 			sectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageHeader,
 			                               CultureInfo.InvariantCulture);
 
-			if (e.PageNumber == 1) {
+			if (rpea.PageNumber == 1) {
 				this.CurrentSection.SectionOffset = (int)startat.Y + Gap;
 			} else {
 				this.CurrentSection.SectionOffset = reportSettings.DefaultMargins.Top;
 			}
 
-			FitSectionToItems (this.CurrentSection,e);
+			FitSectionToItems (this.CurrentSection,rpea);
 			return new PointF (0,
 			                   this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height + Gap);
 		}
@@ -187,39 +265,36 @@ namespace SharpReportCore {
 			return new PointF(0,this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height);
 		}
 		
-		
-		
-		
-		protected virtual int RenderSection (BaseSection section,ReportPageEventArgs rpea) {
+		protected virtual int RenderSection (ReportPageEventArgs rpea) {
 			Point drawPoint	= new Point(0,0);
-			if (section.Visible){
-				section.Render (rpea);
+			
+			if (this.CurrentSection.Visible){
+				this.CurrentSection.Render (rpea);
 				
-				foreach (BaseReportItem item in section.Items) {
+				foreach (BaseReportItem item in this.CurrentSection.Items) {
 					if (item.Parent == null) {
-						item.Parent = section;
+						item.Parent = this.CurrentSection;
 					}
-					item.SectionOffset = section.SectionOffset;
+					item.SectionOffset = this.CurrentSection.SectionOffset;
 					this.DrawSingleItem (rpea,item);
 					
-					drawPoint.Y = section.SectionOffset + section.Size.Height;
-					rpea.LocationAfterDraw = new PointF (rpea.LocationAfterDraw.X,section.SectionOffset + section.Size.Height);
+					drawPoint.Y = this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height;
+					rpea.LocationAfterDraw = new PointF (rpea.LocationAfterDraw.X,this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height);
 					
 				}
 				
-				if ((section.CanGrow == false)&& (section.CanShrink == false)) {
-					return section.Size.Height;
+				if ((this.CurrentSection.CanGrow == false)&& (this.CurrentSection.CanShrink == false)) {
+					return this.CurrentSection.Size.Height;
 				}
 				
 				return drawPoint.Y;
 			}
 			return drawPoint.Y;
 		}
-	
+		
 		
 		protected void DrawSingleItem (ReportPageEventArgs rpea,BaseReportItem item){
 			item.SuspendLayout();
-//			System.Console.WriteLine("\tDrawSingleItem {0}",item.Name);
 			item.FormatOutput -= new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
 			item.FormatOutput += new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
 			item.Render(rpea);
@@ -234,7 +309,6 @@ namespace SharpReportCore {
 				if (!String.IsNullOrEmpty(baseDataItem.FormatString)) {
 					
 					rpea.FormatedValue = defaultFormatter.FormatItem (baseDataItem);
-//					System.Console.WriteLine("\tFormated Value = {0}",rpea.FormatedValue);
 				} else {
 					rpea.FormatedValue = rpea.ValueToFormat;
 				}
@@ -256,33 +330,32 @@ namespace SharpReportCore {
 			                                   section.Size.Height);
 			
 			if ((section.CanGrow == true)||(section.CanShrink == true))  {
-				AdjustSection (section,rpea);
+				AbstractRenderer.AdjustSection (section,rpea);
 			} else {
-				AdjustItems (section,rpea);
+				AbstractRenderer.AdjustItems (section,rpea);
 				
 			}
 		}
 		
-		private void AdjustItems (BaseSection section,ReportPageEventArgs e){
+		private static void AdjustItems (BaseSection section,ReportPageEventArgs e){
 
 			int toFit = section.Size.Height;
 			foreach (BaseReportItem rItem in section.Items) {
-				if (!CheckItemInSection (section,rItem,e)){
+				if (!AbstractRenderer.CheckItemInSection (section,rItem,e)){
 					
 					rItem.Size = new Size (rItem.Size.Width,
 					                       toFit - rItem.Location.Y);
 					
 				}
 			}
-			
 		}
 		
-		private void AdjustSection (BaseSection section,ReportPageEventArgs e){
+		private static void AdjustSection (BaseSection section,ReportPageEventArgs e){
 			
 			foreach (BaseReportItem rItem in section.Items) {
-				if (!CheckItemInSection (section,rItem,e)){
+				if (!AbstractRenderer.CheckItemInSection (section,rItem,e)){
 					
-					SizeF size = MeasureReportItem (rItem,e);
+					SizeF size = AbstractRenderer.MeasureReportItem (rItem,e);
 					
 					section.Size = new Size (section.Size.Width,
 					                         Convert.ToInt32(rItem.Location.Y + size.Height));
@@ -292,9 +365,9 @@ namespace SharpReportCore {
 		}
 		
 		
-		private bool CheckItemInSection (BaseSection section,BaseReportItem item ,ReportPageEventArgs e) {
+		private static bool CheckItemInSection (BaseSection section,BaseReportItem item ,ReportPageEventArgs e) {
 			Rectangle secRect = new Rectangle (0,0,section.Size.Width,section.Size.Height);
-			SizeF size = MeasureReportItem(item,e);
+			SizeF size = AbstractRenderer.MeasureReportItem(item,e);
 			Rectangle itemRect = new Rectangle (item.Location.X,
 			                                    item.Location.Y,
 			                                    (int)size.Width,
@@ -305,12 +378,13 @@ namespace SharpReportCore {
 			return false;
 		}
 		
-		private  SizeF MeasureReportItem(IItemRenderer item,
+		private static SizeF MeasureReportItem(IItemRenderer item,
 		                                                    ReportPageEventArgs e) {
 			SizeF sizeF = new SizeF ();
 			BaseTextItem myItem = item as BaseTextItem;
 			if (myItem != null) {
 				string str = String.Empty;
+				
 				if (item is BaseTextItem) {
 					BaseTextItem it = item as BaseTextItem;
 					str = it.Text;
@@ -318,7 +392,7 @@ namespace SharpReportCore {
 					BaseDataItem it = item as BaseDataItem;
 					str = it.DbValue;
 				}
-			
+		
 				sizeF = e.PrintPageEventArgs.Graphics.MeasureString(str,
 				                                                    myItem.Font,
 				                                                    myItem.Size.Width,
@@ -331,38 +405,38 @@ namespace SharpReportCore {
 		}
 		#endregion
 		
+		
 		#region virtuals
 		
-		protected virtual void ReportQueryPage (object sender,QueryPageSettingsEventArgs e) {
-			e.PageSettings.Margins = reportSettings.DefaultMargins;
+		protected virtual void ReportQueryPage (object sender,QueryPageSettingsEventArgs qpea) {
+			qpea.PageSettings.Margins = reportSettings.DefaultMargins;
 		}
 		
 		
-		protected virtual void  ReportBegin (object sender,ReportPageEventArgs e) {
+		protected virtual void  ReportBegin (object sender,PrintEventArgs pea) {
+//			System.Console.WriteLine("\tAbstract - ReportBegin");
 		}
 		
-		protected virtual void  BeginPrintPage (object sender,ReportPageEventArgs e) {
-			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageHeader,CultureInfo.InvariantCulture);
-		}
 		
-		protected virtual void  PrintBodyStart (object sender,ReportPageEventArgs e) {
-				this.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,
+		protected virtual void  BodyStart (object sender,ReportPageEventArgs rpea) {
+//			System.Console.WriteLine("\tAbstract - PrintBodyStart");
+			this.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,
 			                                    CultureInfo.InvariantCulture);
 			
 		}
 		
-		protected virtual void  PrintBodyEnd (object sender,ReportPageEventArgs e) {
-			
-		}
 		
-		protected virtual void  PrintPageEnd (object sender,ReportPageEventArgs e) {		
-//			BaseSection section = null;
-//			section = CurrentSection;
-//			section.SectionOffset = reportSettings.PageSettings.Bounds.Height - reportSettings.DefaultMargins.Top - reportSettings.DefaultMargins.Bottom;
-//			FitSectionToItems (section,e);
-//			RenderSection (section,e);
+	
+		protected virtual void  OnBodyEnd (object sender,ReportPageEventArgs rpea) {
+//			System.Console.WriteLine("\tAbstarct - PrintBodyEnd");
+		this.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportFooter,
+			                                    CultureInfo.InvariantCulture);
 		}
 		
+		protected virtual void  ReportEnd (object sender,PrintEventArgs e) {
+//			System.Console.WriteLine("\tAbstract - ReportEnd");
+		}
+	
 		#endregion
 		
 	
@@ -408,11 +482,12 @@ namespace SharpReportCore {
 			}
 		}
 		
-		protected int Gap {
+		protected static int Gap {
 			get {
 				return gap;
 			}
 		}
+		
 		protected Point DetailEnds {
 			get {
 				return detailEnds;
@@ -433,7 +508,8 @@ namespace SharpReportCore {
 		#endregion
 	
 		#region IDispoable
-		public virtual void Dispose(){
+		public  void Dispose(){
+			System.Console.WriteLine("base:Dispose()");
 			if (this.reportDocument != null) {
 				this.reportDocument.Dispose();
 			}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/AbstractFormatter.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/AbstractFormatter.cs
index ec84c5dd52..f0faa0858e 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/AbstractFormatter.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/AbstractFormatter.cs
@@ -39,19 +39,17 @@ namespace SharpReportCore {
 		}
 		
 		protected bool CheckFormat (string format) {
-			if (format.Length > 0) {
-				return true;
-			} else {
+			if (String.IsNullOrEmpty(format)) {
 				return false;
-			}
+			} 
+			return true;
 		}
 		
 		protected bool CheckValue (string toFormat) {
-			if ((toFormat == null)||(toFormat.Length == 0) ) {
+			if (String.IsNullOrEmpty(toFormat)) {
 				return false;
-			} else {
-				return true;
 			}
+			return true;
 		}
 	}
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/DefaultFormatter.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/DefaultFormatter.cs
index dbfecf2bbd..d1763096ce 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/DefaultFormatter.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/DefaultFormatter.cs
@@ -43,7 +43,7 @@ namespace SharpReportCore{
 		///<param name="item">A ReportDataItem</param>
 		/// 
 		public string FormatItem (BaseDataItem item) {
-			System.Console.WriteLine("FormatItem {0}  /  {1}",item.DataType,item.FormatString);
+			
 			if (item == null) {
 				throw new ArgumentNullException("item");
 			}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/BaseShape.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/BaseShape.cs
index e4ed6a94a5..a6a4abdd70 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/BaseShape.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/BaseShape.cs
@@ -33,11 +33,6 @@ namespace SharpReportCore {
 	
 	public abstract class BaseShape : object {
 		
-	
-		public BaseShape() {
-		}
-		
-		
 		public void FillShape (Graphics graphics, Brush brush,RectangleF rectangle) {
 			
 			GraphicsPath path1 = this.CreatePath(rectangle);
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/Border.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/Border.cs
index 6ac7c8a443..cd5347a7ec 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/Border.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/Border.cs
@@ -44,6 +44,9 @@ namespace SharpReportCore {
 		}
 		
 		public void DrawBorder (Graphics graphics, RectangleF rectangle) {
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			using (Pen p = new Pen(baseLine.Color,baseLine.Thickness)) {
 				p.DashStyle = baseLine.DashStyle;
 				graphics.DrawRectangle (p,rectangle.Left,
@@ -54,6 +57,9 @@ namespace SharpReportCore {
 		}
 		
 		public void DrawBorder (Graphics graphics, Rectangle rectangle ) {
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			using (Pen p = new Pen(baseLine.Color,baseLine.Thickness)) {
 				p.DashStyle = baseLine.DashStyle;
 				graphics.DrawRectangle (p,rectangle);
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs
index 0cb81848c0..df7802fd5b 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs
@@ -27,17 +27,17 @@ using System.Drawing;
 using System.ComponentModel;
 using System.Globalization;
 using System.Drawing.Printing;
-	
+
 using SharpReportCore;
 
-	/// <summary>
-	/// Renderer for DataReports
-	/// </summary>
-	/// <remarks>
-	/// 	created by - Forstmeier Peter
-	/// 	created on - 13.12.2004 11:07:59
-	/// </remarks>
-	/// 
+/// <summary>
+/// Renderer for DataReports
+/// </summary>
+/// <remarks>
+/// 	created by - Forstmeier Peter
+/// 	created on - 13.12.2004 11:07:59
+/// </remarks>
+/// 
 
 namespace SharpReportCore {
 	public class RenderDataReport : AbstractDataRenderer {
@@ -49,17 +49,19 @@ namespace SharpReportCore {
 		public RenderDataReport(ReportModel model,DataManager dataManager):base (model,dataManager){
 //			base.DataManager.GroupChanged += new EventHandler<GroupChangedEventArgs>(OnGroupChanged);
 //			base.DataManager.GroupChanging += new EventHandler <EventArgs> (OnGroupChanging);
+
+			
 		}
 		
 
 		void OnGroupChanged (object sender,GroupChangedEventArgs e) {
 			
-			System.Console.WriteLine("OnGroupChanged");	
+			System.Console.WriteLine("OnGroupChanged");
 		}
 		
 		void OnGroupChanging (object sender, EventArgs e) {
 			
-			System.Console.WriteLine("OnGroupChanging");	
+			System.Console.WriteLine("OnGroupChanging");
 		}
 		
 		private void OnListChanged (object sender,System.ComponentModel.ListChangedEventArgs e) {
@@ -68,86 +70,93 @@ namespace SharpReportCore {
 //			                         e.ListChangedType);
 		}
 		
-		
-		private void OnSectionPrinting (object sender,SectionPrintingEventArgs e) {
-//			System.Console.WriteLine("");
-//			System.Console.WriteLine("Begin Print <{0}> with  <{1}> Items ",e.Section.Name,
-//			                         e.Section.Items.Count);
-		}
-		
-		private void OnSectionPrinted (object sender,SectionPrintingEventArgs e) {
-//			System.Console.WriteLine("Section Printed <{0}> ",e.Section.Name);
-			
-		}
-		
-		private void AddSectionEvents () {
-			base.CurrentSection.SectionPrinting += new EventHandler<SectionPrintingEventArgs>(OnSectionPrinting);
-			base.CurrentSection.SectionPrinted += new EventHandler<SectionPrintingEventArgs>(OnSectionPrinted);
-		}
-		
-		private void RemoveSectionEvents () {
-			base.CurrentSection.SectionPrinting -= new EventHandler<SectionPrintingEventArgs>(OnSectionPrinting);
-			base.CurrentSection.SectionPrinted -= new EventHandler<SectionPrintingEventArgs>(OnSectionPrinted);
-		}
-		
 		#region overrides
 		
 		#region Draw the different report Sections
+		
 		private PointF DoReportHeader (ReportPageEventArgs rpea){
 			PointF endAt = base.MeasureReportHeader (rpea);
-
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
+			base.RenderSection (rpea);
+			base.DoItems(rpea);
 			
-			if (base.CurrentSection.PageBreakAfter) {
-				base.PageBreak(rpea,base.CurrentSection);
-				base.CurrentSection.PageBreakAfter = false;
-				return new PointF();
-			}
 			return endAt;
 		}
 		
 		
 		private PointF DoPageHeader (PointF startAt,ReportPageEventArgs rpea){
-			
 			PointF endAt = base.MeasurePageHeader (startAt,rpea);
-
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
+			base.RenderSection (rpea);
+			base.DoItems(rpea);
 			return endAt;
 		}
 		
 		
 		private void DoPageEnd (ReportPageEventArgs rpea){
-//			System.Console.WriteLine("\tDoPageEnd");
-			base.PrintPageEnd(this,rpea);
+//			System.Console.WriteLine("DataRenderer:DoPageEnd");
 			base.MeasurePageEnd (rpea);
-			
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
-			
+			base.RenderSection (rpea);
+			base.DoItems(rpea);
 		}
 		
 		//TODO how should we handle ReportFooter, print it on an seperate page ????
 		private void  DoReportFooter (PointF startAt,ReportPageEventArgs rpea){
+//			System.Console.WriteLine("DoReportFooter");
 			base.MeasureReportFooter(rpea);
-
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
+			base.RenderSection (rpea);
+			base.DoItems(rpea);
 		}
+		
 		#endregion
 
+		#region test
+		
+		protected override void PrintReportHeader (object sender, ReportPageEventArgs e) {
+			base.PrintReportHeader (sender,e);
+			this.currentPoint = DoReportHeader (e);
+			base.RemoveSectionEvents();
+		}
+		
+		protected override void PrintPageHeader (object sender, ReportPageEventArgs e) {
+			base.PrintPageHeader (sender,e);
+			this.currentPoint = DoPageHeader (this.currentPoint,e);
+			base.DetailStart = new Point ((int)currentPoint.X,(int)currentPoint.Y +1);
+			base.RemoveSectionEvents();
+		}
+		
+		protected override void PrintPageEnd(object sender, ReportPageEventArgs rpea) {
+//			System.Console.WriteLine("DataRenderer:PrintPageEnd");
+			base.PrintPageEnd(sender,rpea);
+			this.DoPageEnd (rpea);
+			base.RemoveSectionEvents();
+		}
+		
+		protected override void PrintReportFooter(object sender, ReportPageEventArgs rpea){
+			System.Console.WriteLine("DataRenderer:PrintReportFooter");
+			base.PrintReportFooter(sender, rpea);
+			DoReportFooter (new PointF(0,base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height),
+			                rpea);
+			base.RemoveSectionEvents();
+		}
+		
+		protected override void ReportEnd(object sender, PrintEventArgs e){
+//			System.Console.WriteLine("DataRenderer:ReportEnd");
+			base.ReportEnd(sender, e);
+		}
+		
+		#endregion
+		
+		
+		#region overrides
+		
+		
 		protected override void ReportQueryPage(object sender, QueryPageSettingsEventArgs qpea) {
 			base.ReportQueryPage (sender,qpea);
 		}
-			
-		protected override void ReportBegin(object sender, ReportPageEventArgs rpea) {
-			base.ReportBegin (sender,rpea);
 		
+		protected override void ReportBegin(object sender, PrintEventArgs pea) {
+//			System.Console.WriteLine("");
+//			System.Console.WriteLine("ReportBegin (BeginPrint)");
+			base.ReportBegin (sender,pea);
 			base.DataManager.ListChanged += new EventHandler<ListChangedEventArgs> (OnListChanged);
 			dataNavigator = base.DataManager.GetNavigator;
 			dataNavigator.ListChanged += new EventHandler<ListChangedEventArgs> (OnListChanged);
@@ -155,98 +164,88 @@ namespace SharpReportCore {
 			base.DataNavigator = dataNavigator;
 		}
 		
-		protected override void BeginPrintPage(object sender, ReportPageEventArgs rpea) {
-//			System.Console.WriteLine("!!! BeginPrintpage");
-			if (rpea == null) {
-				throw new ArgumentNullException("rpea");
-			}
-			
-			base.BeginPrintPage (sender,rpea);
-			
-			if (rpea.PageNumber == 1) {
-				//Draw ReportHeader
-				this.currentPoint = DoReportHeader (rpea);
-			}
-			
-			//Draw Pageheader
-			this.currentPoint = DoPageHeader (this.currentPoint,rpea);
-			
-			base.DetailStart = new Point ((int)currentPoint.X,(int)currentPoint.Y);
 		
-		}
 		
-	
+		protected override void BodyStart(object sender, ReportPageEventArgs rpea) {
+//			System.Console.WriteLine("DataRenderer:PrintBodyStart");
+			base.BodyStart (sender,rpea);
+			this.currentPoint = new PointF (base.CurrentSection.Location.X,
+			                                this.DetailStart.Y);
 			
-		protected override void PrintBodyStart(object sender, ReportPageEventArgs rpea) {
+			base.CurrentSection.SectionOffset = (int)this.DetailStart.Y + AbstractRenderer.Gap;
+		}
+		
+		
+		protected override void PrintDetail(object sender, ReportPageEventArgs rpea){
 			Rectangle sectionRect;
-			Rectangle detailRect;
-
-			base.PrintBodyStart (sender,rpea);
-
-			BaseSection section = base.CurrentSection;
-			
-			section.SectionOffset = (int)this.currentPoint.Y + base.Gap;
-			
-			detailRect = base.DetailRectangle (rpea);
-			
-			//this is only for the first record, zhe other details will be calculated
-			sectionRect = new Rectangle (rpea.PrintPageEventArgs.MarginBounds.Left,
-			                             section.SectionOffset,
-			                             rpea.PrintPageEventArgs.MarginBounds.Width,
-			                             section.Size.Height);
-//			DebugRectangle (e,detailRect);
+			bool firstOnPage = true;
+//			System.Console.WriteLine("RenderDataReport:PrintDetail");
+			base.PrintDetail(sender, rpea);
 			
+//			base.DebugRectangle(rpea,base.DetailRectangle(rpea));
 			// no loop if there is no data
-
 			if (! this.dataNavigator.HasMoreData ) {
 				rpea.PrintPageEventArgs.HasMorePages = false;
 				return;
 			}
+			
+			// first element
+			if (rpea.PageNumber == 1) {
+				this.dataNavigator.MoveNext();
+			}
+			
+			do {
+				
+				this.dataNavigator.Fill (base.CurrentSection.Items);
 
-			while (this.dataNavigator.MoveNext()) {
-				this.dataNavigator.Fill (base.CurrentSection.Items);	
-				base.RenderSection (section,rpea);
-				section.SectionOffset = section.SectionOffset + section.Size.Height  + 2 * base.Gap;
+				base.RenderSection (rpea);
+				
+				if (!firstOnPage) {
+					base.CurrentSection.SectionOffset = base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height  + 2 * AbstractRenderer.Gap;
+					
+				}
+				
 				
 				base.FitSectionToItems (base.CurrentSection,rpea);
 				
 				sectionRect = new Rectangle (rpea.PrintPageEventArgs.MarginBounds.Left,
-				                             section.SectionOffset,
+				                             base.CurrentSection.SectionOffset,
 				                             rpea.PrintPageEventArgs.MarginBounds.Width,
-				                             section.Size.Height);
+				                             base.CurrentSection.Size.Height);
 				
-				if (!detailRect.Contains(sectionRect)) {
-					base.PageBreak(rpea,section);
+				if (!base.DetailRectangle(rpea).Contains(sectionRect)) {
+					AbstractRenderer.PageBreak(rpea);
 					return;
-				}	
+				}
 				
-			}
-			
-			DoReportFooter (new PointF(0,section.SectionOffset + section.Size.Height),
-			                rpea);
-				
-			rpea.PrintPageEventArgs.HasMorePages = false;
+				int i = base.DoItems(rpea);
+				this.currentPoint = new PointF (base.CurrentSection.Location.X, i);
+				firstOnPage = false;
 
-			//Did we have a pagebreak 
-			if (base.CurrentSection.PageBreakAfter) {
-				base.PageBreak(rpea,section);
-				base.CurrentSection.PageBreakAfter = false;
-				return;
+				if (this.dataNavigator.CurrentRow < this.dataNavigator.Count -1) {
+					if (base.CurrentSection.PageBreakAfter) {
+						AbstractRenderer.PageBreak(rpea);;
+						return;
+					}
+				}
 			}
+			while (this.dataNavigator.MoveNext());
+			this.RemoveSectionEvents();
 		}
 		
-		
-		protected override void PrintBodyEnd(object sender, ReportPageEventArgs rpea) {
-//			System.Console.WriteLine("PrintBodyEnd");
-			base.PrintBodyEnd (sender,rpea);
+		protected override void OnBodyEnd(object sender, ReportPageEventArgs rpea) {
+//			System.Console.WriteLine("PrintBodyEnd ????");
+			base.OnBodyEnd (sender,rpea);
+//			DoReportFooter (new PointF(0,base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height),
+//			                rpea);
+			rpea.PrintPageEventArgs.HasMorePages = false;
 		}
 		
 		
-		protected override void PrintPageEnd(object sender, ReportPageEventArgs rpea) {
-			System.Console.WriteLine("!! Page End");
-			this.DoPageEnd (rpea);
-		}
-	
+		
+		
+		#endregion
+		
 		public override string ToString() {
 			base.ToString();
 			return "RenderDataReport";
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs
index fc017fa790..e0b8a20ea3 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs
@@ -46,39 +46,14 @@ namespace SharpReportCore {
 		                             
 		}
 		
-		private void OnSectionPrinting (object sender,SectionPrintingEventArgs e) {
-			System.Console.WriteLine("");
-			System.Console.WriteLine("Begin Print <{0}> with  <{1}> Items ",e.Section.Name,
-			                         e.Section.Items.Count);
-		}
-		
-		private void OnSectionPrinted (object sender,SectionPrintingEventArgs e) {
-			System.Console.WriteLine("Section Printed {0} ",e.Section.Name);
-			
-		}
-		
-		private void AddSectionEvents () {
-			base.CurrentSection.SectionPrinting += new EventHandler<SectionPrintingEventArgs>(OnSectionPrinting);
-			base.CurrentSection.SectionPrinted += new EventHandler<SectionPrintingEventArgs>(OnSectionPrinted);
-		}
-		
-		private void RemoveSectionEvents () {
-			base.CurrentSection.SectionPrinting -= new EventHandler<SectionPrintingEventArgs>(OnSectionPrinting);
-			base.CurrentSection.SectionPrinted -= new EventHandler<SectionPrintingEventArgs>(OnSectionPrinted);
-		}
-		
-		
 		
 		#region Draw the different report Sections
 		private PointF DoReportHeader (ReportPageEventArgs rpea){
 			PointF endAt = base.MeasureReportHeader (rpea);
+			base.RenderSection (rpea);
 
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
-			
-			if (base.CurrentSection.PageBreakAfter) {
-				base.PageBreak(rpea,base.CurrentSection);
+			if (base.CheckPageBreakAfter()) {
+				AbstractRenderer.PageBreak(rpea);
 				base.CurrentSection.PageBreakAfter = false;
 				return new PointF();
 			}
@@ -88,96 +63,57 @@ namespace SharpReportCore {
 		private PointF DoPageHeader (PointF startAt,ReportPageEventArgs rpea){
 			
 			PointF endAt = base.MeasurePageHeader (startAt,rpea);
-
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
+			base.RenderSection (rpea);
 			return endAt;
 		}
 		
 		private void DoPageEnd (ReportPageEventArgs rpea){
 			base.PrintPageEnd(this,rpea);
 			base.MeasurePageEnd (rpea);
-			
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
-			this.RemoveSectionEvents();
-			
+			base.RenderSection (rpea);
+
 		}
 		
 		//TODO how should we handle ReportFooter, print it on an seperate page ????
 		private void  DoReportFooter (PointF startAt,ReportPageEventArgs rpea){
 			base.MeasureReportFooter(rpea);
-
-			this.AddSectionEvents();
-			base.RenderSection (base.CurrentSection,rpea);
+			base.RenderSection (rpea);
 			this.RemoveSectionEvents();
 		}
 		
 		#endregion
 		
-		#region event's
-		protected override  void ReportQueryPage (object sender,QueryPageSettingsEventArgs qpea) {
-			base.ReportQueryPage (sender,qpea);
-		}
-		
+		#region test
 		
-		protected override void ReportBegin (object sender,ReportPageEventArgs rpea) {
-			base.ReportBegin (sender,rpea);
+		protected override void PrintReportHeader (object sender, ReportPageEventArgs e) {
+			base.PrintReportHeader (sender,e);
+			this.currentPoint = DoReportHeader (e);
 		}
 		
-		/// <summary>
-		/// ReportHeader and if PageHeader
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		/// 
-		protected override void  BeginPrintPage (object sender,ReportPageEventArgs rpea) {
-			
-			if (rpea == null) {
-				throw new ArgumentNullException("rpea");
-			}
-			
-			base.BeginPrintPage (sender,rpea);
-			
-			//Draw ReportHeader
-			if (rpea.PageNumber == 1) {
-				//Draw ReportHeader
-				this.currentPoint = DoReportHeader (rpea);
-			}
-
-			
-			if (base.CurrentSection.PageBreakAfter) {
-				base.PageBreak(rpea,base.CurrentSection);
-				base.CurrentSection.PageBreakAfter = false;
-				return;
-			}
-			
-			//Draw Pageheader
-	
-			this.currentPoint = DoPageHeader (this.currentPoint,rpea);
-
+		protected override void PrintPageHeader (object sender, ReportPageEventArgs e) {
+			base.PrintPageHeader (sender,e);
+			this.currentPoint = DoPageHeader (this.currentPoint,e);
 			base.DetailStart = new Point ((int)currentPoint.X,(int)currentPoint.Y);
 		}
 		
+		#endregion
+		
+		
+		#region event's
+		
 		
 		/// <summary>
 		/// Detail Section
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
-		protected override void PrintBodyStart (object sender,ReportPageEventArgs rpea) {
-			base.PrintBodyStart (sender,rpea);
+		protected override void BodyStart (object sender,ReportPageEventArgs rpea) {
+			base.BodyStart (sender,rpea);
+			base.CurrentSection.SectionOffset = (int)this.currentPoint.Y + AbstractRenderer.Gap;
 			
-			BaseSection section = base.CurrentSection;
-			section.SectionOffset = (int)this.currentPoint.Y + base.Gap;
-			
-			Rectangle detailRect = base.DetailRectangle (rpea);
-			FitSectionToItems (section,rpea);
-			
-			this.AddSectionEvents();
-			base.RenderSection (section,rpea);
-			this.RemoveSectionEvents();
+			FitSectionToItems (base.CurrentSection,rpea);
+			base.RenderSection (rpea);
+
 		}
 		/// <summary>
 		/// Print the PageFooter 
@@ -190,13 +126,17 @@ namespace SharpReportCore {
 		
 		
 		
-		protected override void PrintBodyEnd (object sender,ReportPageEventArgs rpea) {
-			base.PrintBodyEnd (sender,rpea);
+		protected override void OnBodyEnd (object sender,ReportPageEventArgs rpea) {
+			
+			base.OnBodyEnd (sender,rpea);
 			this.DoReportFooter (new PointF(0,base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height),
 			                     rpea);
 		}
 		
 		
+		protected override void ReportEnd(object sender, PrintEventArgs e){
+			base.ReportEnd(sender, e);
+		}
 		
 		#endregion
 		
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/ReportDocument.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/ReportDocument.cs
index 831171577e..6bc24ed2a1 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/ReportDocument.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/ReportDocument.cs
@@ -5,7 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Drawing.Printing;
-	
+
 using SharpReportCore;
 /// <summary>
 /// Derived from PrintDocument to have more control about printing
@@ -14,46 +14,80 @@ using SharpReportCore;
 /// 	created by - Forstmeier Peter
 /// 	created on - 21.11.2004 14:47:20
 /// </remarks>
-	
+
 namespace SharpReportCore {
 	
 	public class ReportDocument : PrintDocument {
 		
-		public event QueryPageSettingsEventHandler QueryPage;
-
-		public event EventHandler<ReportPageEventArgs> ReportBegin;
-		public event EventHandler<ReportPageEventArgs> PrintPageBegin;
 		public event EventHandler<ReportPageEventArgs> PrintPageBodyStart;
+	
 		public event EventHandler<ReportPageEventArgs> PrintPageBodyEnd;
-		public event EventHandler<ReportPageEventArgs> PrintPageEnd;
-		public event EventHandler<ReportPageEventArgs> ReportEnd;
 		
 		
-		int pageNr;
 		
+		public event EventHandler<ReportPageEventArgs> RenderReportHeader;
+		public event EventHandler<ReportPageEventArgs> RenderPageHeader;
+		public event EventHandler<ReportPageEventArgs> RenderDetails;
+		public event EventHandler<ReportPageEventArgs> RenderPageEnd;
+		public event EventHandler<ReportPageEventArgs> RenderReportEnd;
+		int pageNumber;
 		
 		public ReportDocument():base() {
-			base.BeginPrint += new PrintEventHandler (ReportDocumentBeginPrint);
 			
-			base.PrintPage += new PrintPageEventHandler (ReportDocumentPrintPage);
+		}
+		
+		
+		#region overriede's
+		
+		protected override void OnQueryPageSettings(QueryPageSettingsEventArgs e){
+			base.OnQueryPageSettings(e);
+		}
+		
+		protected override void OnBeginPrint(PrintEventArgs e){
+			base.OnBeginPrint(e);
+			pageNumber = 0;
+		}
+		
+		protected override void OnPrintPage(PrintPageEventArgs e){
+			base.OnPrintPage(e);
+			pageNumber ++;
+
+			ReportPageEventArgs pea = new ReportPageEventArgs (e,pageNumber,
+			                                                   false,new PointF (0,0));
+			GeneratePage (pea);
 			
-			base.EndPrint += new PrintEventHandler (ReportDocumentEndPrint);
-			base.QueryPageSettings += new QueryPageSettingsEventHandler (ReportDocumentQueryPage);
+
+			if (pea.PrintPageEventArgs.HasMorePages == false) {
+				if (this.RenderReportEnd != null) {
+					this.RenderReportEnd(this,pea);
+				}
+//				this.OnEndPrint (new PrintEventArgs());
+			}
 		}
 		
-		void GeneratePage (SharpReportCore.ReportPageEventArgs page) {		
-			if (PrintPageBegin != null) {
-				PrintPageBegin (this,page);
+		protected override void OnEndPrint(PrintEventArgs e){
+			base.OnEndPrint(e);
+		}
+		
+		#endregion
+		
+		private void GeneratePage (SharpReportCore.ReportPageEventArgs page) {
+			
+			if (this.pageNumber == 1) {
+				if (this.RenderReportHeader != null) {
+					this.RenderReportHeader(this,page);
+				}
 			}
 			
-			if (page.ForceNewPage == true) {
-				page.PrintPageEventArgs.HasMorePages = true;
-				return;
+			if (this.RenderPageHeader != null) {
+				this.RenderPageHeader (this,page);
 			}
+			
+			
 			// print PageFooter before DetailSection
 			//so it's much easyer to calculate size of DetailSection
-			if (PrintPageEnd != null) {
-				PrintPageEnd (this,page);
+			if (RenderPageEnd != null) {
+				RenderPageEnd (this,page);
 			}
 			
 			
@@ -61,56 +95,28 @@ namespace SharpReportCore {
 				PrintPageBodyStart (this,page);
 			}
 			
-			if (PrintPageBodyEnd != null) {
-				PrintPageBodyEnd (this,page);
-			}
-		}
-		
-		#region events
-		//this events are also used by PrintPreviewControl
-		public  void ReportDocumentBeginPrint (object sender,PrintEventArgs e) {
-			pageNr = 0;
-		}
-		
-		public void ReportDocumentQueryPage (object sender, QueryPageSettingsEventArgs e) {
-			if (QueryPage != null) {
-				QueryPage (this,e);
-			}
-		}
-		
-		public void ReportDocumentPrintPage (object sender, PrintPageEventArgs e) {
-			pageNr ++;
-			ReportPageEventArgs pea = new ReportPageEventArgs (e,pageNr,false,new PointF (0,0));
-			
-			if (pageNr == 1) {
-				if (ReportBegin != null) {
-					ReportBegin (this,pea);
-				}
-			}
-			
-			GeneratePage (pea);
-			
-			if ((pea.ForceNewPage == true) && (pea.PrintPageEventArgs.HasMorePages == true)) {
-				pea.ForceNewPage = false;
-			    	return;
+			if (this.RenderDetails != null) {
+				this.RenderDetails(this,page);
 			}
-			if (pea.PrintPageEventArgs.HasMorePages == false) {
-				if (ReportEnd != null) {
-					ReportEnd (this,pea);
+
+			if (page.PrintPageEventArgs.HasMorePages == false) {
+				if (PrintPageBodyEnd != null) {
+					PrintPageBodyEnd (this,page);
 				}
 			}
 			
 		}
-		public void  ReportDocumentEndPrint (object sender,PrintEventArgs e) {
-//			System.Console.WriteLine("\tReportDocument EndPrint");
-			pageNr = 0;
-			if (ReportEnd != null) {
-				ReportEnd (this,null);
+	
+	
+		
+		#region Property's
+		
+		public int PageNumber {
+			get {
+				return pageNumber;
 			}
-			
 		}
-		#endregion
-		
 		
+		#endregion
 	}
 }
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs
index 4d35219e5a..c68019cbb1 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs
@@ -210,6 +210,9 @@ namespace SharpReportCore{
 		
 		
 		public void SetSettings(XmlElement xmlSettings) {
+			if (xmlSettings == null) {
+				throw new ArgumentNullException("xmlSettings");
+			}
 			XmlNodeList nodeList = xmlSettings.ChildNodes;
 			XmlFormReader xmlFormReader = new XmlFormReader();
 			base.InitDone = false;
@@ -492,6 +495,7 @@ namespace SharpReportCore{
 				return reportType;
 			}
 			set {
+				System.Console.WriteLine("ReportType set to {0}",value);
 				if (reportType != value) {
 					reportType = value;
 					this.NotifyPropertyChanged("ReportType");
@@ -622,6 +626,12 @@ namespace SharpReportCore{
 			set {
 				if (dataModel != value) {
 					dataModel = value;
+					System.Console.WriteLine("DataModel type = {0}",this.dataModel.ToString());
+					if (this.dataModel != GlobalEnums.enmPushPullModel.FormSheet) {
+						this.reportType = GlobalEnums.enmReportType.DataReport;
+					} else {
+						this.reportType = GlobalEnums.enmReportType.FormSheet;
+					}
 					this.NotifyPropertyChanged("DataModel");
 				}
 			}
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
index 784104e2f2..a7825b66b9 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
@@ -133,6 +133,8 @@
     <Compile Include="Interfaces\IDataNavigator.cs" />
     <Compile Include="Events\PrintEventArgs.cs" />
     <Compile Include="BaseItems\TableItem.cs" />
+    <Compile Include="Exceptions\IllegalQueryException.cs" />
+    <Compile Include="Events\SectionRenderEventArgs.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="BaseItems" />
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs
index 88155fd8a9..0d37a3e22c 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs
@@ -45,6 +45,16 @@ namespace SharpReportCore {
 		
 		public event EventHandler <SharpReportEventArgs> NoData;
 		public event EventHandler <SharpReportParametersEventArgs> ParametersRequest;
+		/// <summary>
+		/// This event is fired before a Section is Rendered, you can use 
+		/// it to modify items to be printed
+		/// </summary>
+		public event EventHandler<SectionRenderEventArgs> SectionRendering;
+		/// <summary>
+		/// This event is fired after a section's output is done
+		/// </summary>
+		public event EventHandler<SectionRenderEventArgs> SectionRendered;
+		
 		
 		public SharpReportEngine() {
 			if (SharpReportCore.GlobalValues.IsValidPrinter() == false) {
@@ -59,7 +69,7 @@ namespace SharpReportCore {
 			if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.FormSheet) {
 				if (this.connectionObject == null) {
 					
-					if (model.ReportSettings.ConnectionString != "") {
+					if (!String.IsNullOrEmpty(model.ReportSettings.ConnectionString)) {
 						this.connectionObject = new ConnectionObject (model.ReportSettings.ConnectionString);
 					}
 					
@@ -93,7 +103,7 @@ namespace SharpReportCore {
 		}
 		
 		
-		void SetSqlParameters (ReportModel model,AbstractParametersCollection sqlParams) {
+		private static void SetSqlParameters (ReportModel model,AbstractParametersCollection sqlParams) {
 			if ((sqlParams == null)||(sqlParams.Count == 0)) {
 				return;
 			}
@@ -112,18 +122,6 @@ namespace SharpReportCore {
 		}
 		
 		
-		
-		private void ApplyReportParameters (ReportModel model,ReportParameters parameters){
-			if (model == null) {
-				throw new MissingModelException();
-			}
-			if (parameters == null ){
-				throw new ArgumentNullException("parameters");
-			}
-			
-			SetSqlParameters (model,parameters.SqlParameters);
-			SetCustomSorting (model,parameters.SortColumnCollection);
-		}
 		#endregion
 		
 		#region Setup for print/preview
@@ -136,7 +134,7 @@ namespace SharpReportCore {
 		}
 
 		private void InitDataContainer (ReportSettings settings) {	
-		
+			System.Console.WriteLine("Engine:InitDataContainer ReportType <{0}>",settings.ReportType);
 			if (settings.ReportType == GlobalEnums.enmReportType.DataReport) {
 				if (settings.CommandText != null) {
 					try {
@@ -147,8 +145,6 @@ namespace SharpReportCore {
 							                                        settings);
 							
 							this.dataManager.DataBind();
-						}else {
-							throw new NullReferenceException("SetupContainer:connectionObject is missing");
 						}
 						
 					}
@@ -183,52 +179,71 @@ namespace SharpReportCore {
 		
 		
 		protected SharpReportCore.AbstractRenderer SetupStandartRenderer (ReportModel model) {
-			
+	
 			AbstractRenderer abstr = null;
-			switch (model.ReportSettings.ReportType) {
-					//FormSheets reports
-				case GlobalEnums.enmReportType.FormSheet:
-					abstr = new RendererFactory().Create (model,null);
-					break;
-					//Databased reports
-				case GlobalEnums.enmReportType.DataReport :
-//					DataManager dataManager = SetupDataContainer (model.ReportSettings);
-					InitDataContainer (model.ReportSettings);
-					if (this.dataManager != null) {
-						if (this.dataManager.DataSource != null) {
-							abstr = new RendererFactory().Create (model,dataManager);
-						}
-						
-					} else {
-						if (NoData != null) {
-							SharpReportEventArgs e = new SharpReportEventArgs();
-							e.PageNumber = 0;
-							e.Cancel = false;
-							NoData (this,e);
-							if (e.Cancel == true) {
-								// If we cancel, we have to create an instance of any kind of renderer
-								//to set the cancel flag to true
-								abstr = new RendererFactory().Create (model,null);
-								abstr.Cancel = true;
-							} else {
-								// Print the report only as Formsheet -> only Text and Graphic Items
-								abstr = new RendererFactory().Create (model,null);
+			try {
+				switch (model.ReportSettings.ReportType) {
+						//FormSheets reports
+					case GlobalEnums.enmReportType.FormSheet:
+						abstr = new RendererFactory().Create (model,null);
+						break;
+						//Databased reports
+					case GlobalEnums.enmReportType.DataReport :
+						InitDataContainer (model.ReportSettings);
+						if (this.dataManager != null) {
+							if (this.dataManager.DataSource != null) {
+								abstr = new RendererFactory().Create (model,dataManager);
+							}
+							
+						} else {
+							if (NoData != null) {
+								SharpReportEventArgs e = new SharpReportEventArgs();
+								e.PageNumber = 0;
+								e.Cancel = false;
+								NoData (this,e);
+								if (e.Cancel == true) {
+									// If we cancel, we have to create an instance of any kind of renderer
+									//to set the cancel flag to true
+									abstr = new RendererFactory().Create (model,null);
+									abstr.Cancel = true;
+								} else {
+									// Print the report only as Formsheet -> only Text and Graphic Items
+									abstr = new RendererFactory().Create (model,null);
+								}
 							}
 						}
-					}
-					
-					break;
-				default:
-					throw new SharpReportException ("SharpReportmanager:SetupRenderer -> Unknown Reporttype");
+						
+						break;
+					default:
+						throw new SharpReportException ("SharpReportmanager:SetupRenderer -> Unknown Reporttype");
+				}
+				abstr.SectionRendering += new EventHandler<SectionRenderEventArgs>(OnSectionPrinting);
+				abstr.SectionRendered +=new EventHandler<SectionRenderEventArgs>(OnSectionPrinted);
+				return abstr;
+			} catch (Exception) {
+				throw; 
 			}
 			
-			return abstr;
 		}
 		
+		private void OnSectionPrinting (object sender,SectionRenderEventArgs e) {
+			if (this.SectionRendering != null) {
+				this.SectionRendering(this,e);
+			} 
+		}
+		
+		private void OnSectionPrinted (object sender,SectionRenderEventArgs e) {
+			if (this.SectionRendered != null) {
+				this.SectionRendered (this,e);
+			} 
+		}
 		
 		protected SharpReportCore.AbstractRenderer SetupPushDataRenderer (ReportModel model,
 		                                                                  DataTable dataTable) {
 			
+			if (model == null) {
+				throw new ArgumentNullException("model");
+			}
 			if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.DataReport) {
 				throw new ArgumentException("SetupPushDataRenderer <No valid ReportModel>");
 			}
@@ -265,8 +280,13 @@ namespace SharpReportCore {
 			if (model == null) {
 				throw new MissingModelException();
 			}
-			AbstractRenderer abstr = SetupStandartRenderer(model);
-			return abstr;
+			try {
+				AbstractRenderer abstr = SetupStandartRenderer(model);
+				return abstr;
+			} catch (Exception) {
+				throw;
+			}
+			
 		}
 		
 		
@@ -305,7 +325,7 @@ namespace SharpReportCore {
 		/// <param name="fileName">Path to ReportFile</param>
 		
 		public void PreviewStandartReport (string fileName) {
-			if (fileName.Length == 0) {
+			if (String.IsNullOrEmpty(fileName)) {
 				throw new ArgumentNullException("fileName");
 			}
 			PreviewStandartReport (fileName,null);
@@ -313,7 +333,8 @@ namespace SharpReportCore {
 		
 		
 		public void PreviewStandartReport (string fileName,ReportParameters reportParameters) {
-			if (fileName.Length == 0) {
+			
+			if (String.IsNullOrEmpty(fileName)) {
 				throw new ArgumentNullException("fileName");
 			}
 
@@ -323,6 +344,10 @@ namespace SharpReportCore {
 				model = ModelFromFile (fileName);
 				if (CheckReportParameters (model,reportParameters)) {
 					renderer = SetupStandartRenderer (model);
+					//				
+//				renderer.SectionRendering += new EventHandler<SectionPrintingEventArgs>(OnTestPrinting);
+//				System.Console.WriteLine("Event should be set");
+
 					if (renderer != null) {
 						PreviewControl.ShowPreview(renderer,1.5,false);
 					}
@@ -330,8 +355,10 @@ namespace SharpReportCore {
 			} catch (Exception) {
 				throw;
 			}
-			
 		}
+		
+		
+		
 		/// <summary>
 		/// Preview a "PushModel - Report"
 		/// </summary>
@@ -358,7 +385,7 @@ namespace SharpReportCore {
 					PreviewControl.ShowPreview(renderer,1.5,false);
 				}
 			} catch (Exception) {
-				
+				throw;
 			}
 		}
 		
@@ -366,16 +393,18 @@ namespace SharpReportCore {
 		
 		#region Printing
 		
-		private void ReportToPrinter (AbstractRenderer renderer,ReportModel model) {
+		private static void ReportToPrinter (AbstractRenderer renderer,ReportModel model) {
 			if (renderer == null) {
-				throw new NullReferenceException("SparpReportEngine:ReportToPrinter: No valid Renderer");
+				throw new ArgumentNullException("renderer");
+			}
+			if (model == null) {
+				throw new ArgumentNullException("model");
 			}
 			PrintDocument  doc = null;
 			if (renderer.Cancel == false) {
 				doc = renderer.ReportDocument;
 				using (PrintDialog dlg = new PrintDialog()) {
 					dlg.Document = doc;
-//					MessageBox.Show (model.ReportSettings.UseStandartPrinter.ToString());
 					if (model.ReportSettings.UseStandartPrinter == true) {
 						dlg.Document.Print();
 					} else {
@@ -414,12 +443,13 @@ namespace SharpReportCore {
 				model = ModelFromFile (fileName);
 				if (CheckReportParameters (model,reportParameters)) {
 					renderer = SetupStandartRenderer (model);
-					this.ReportToPrinter (renderer,model);
+					SharpReportEngine.ReportToPrinter (renderer,model);
 				}
 			} catch (Exception) {
 				throw;
 			}
 		}
+		
 		/// <summary>
 		/// Print a PullModel Report
 		/// </summary>
@@ -447,9 +477,10 @@ namespace SharpReportCore {
 				}
 				
 				renderer = SetupPushDataRenderer (model,dataTable);
-				this.ReportToPrinter(renderer,model);
+				SharpReportEngine.ReportToPrinter(renderer,model);
 				
 			} catch (Exception) {
+				throw;
 			}
 			
 			
@@ -462,7 +493,7 @@ namespace SharpReportCore {
 		/// <param name="fileName"></param>
 		/// <param name="dataTable"></param>
 		public void PrintPushDataReport (string fileName,DataTable dataTable) {
-			if (fileName.Length == 0) {
+			if (String.IsNullOrEmpty(fileName)) {
 				throw new ArgumentNullException("fileName");
 			}
 			if (dataTable == null) {
@@ -478,9 +509,10 @@ namespace SharpReportCore {
 				}
 				
 				renderer = this.SetupPushDataRenderer (model,dataTable);
-				this.ReportToPrinter(renderer,model);
+				SharpReportEngine.ReportToPrinter(renderer,model);
 				
 			} catch (Exception) {
+				throw;
 			}
 		}
 		
diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Xml/XmlHelper.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Xml/XmlHelper.cs
index a1634f9aa2..0aa06fe4e9 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportCore/Xml/XmlHelper.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Xml/XmlHelper.cs
@@ -43,6 +43,9 @@ namespace SharpReportCore {
 		/// <returns>"Report is SharpReport or not</returns>/returns>
 		/// 
 		public static bool IsSharpReport (XmlElement elem) {
+			if (elem == null) {
+				throw new ArgumentNullException("elem");
+			}
 			return (elem.Name.Equals (SharpReportCore.GlobalValues.SharpReportString));
 		}
 		
diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs
index 4ef86de9a1..5d1d20b245 100644
--- a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs
+++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs
@@ -8,6 +8,7 @@
  */
 
 using System;
+using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.Windows.Forms;
@@ -29,7 +30,7 @@ namespace ReportGenerator{
 		private System.Windows.Forms.GroupBox groupBox2;
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.TextBox txtReportName;
-		private System.Windows.Forms.ComboBox cboReportType;
+//		private System.Windows.Forms.ComboBox cboReportType;
 		private System.Windows.Forms.ComboBox cboGraphicsUnit;
 		private System.Windows.Forms.TextBox txtFileName;
 		private System.Windows.Forms.TextBox txtPath;
@@ -40,6 +41,8 @@ namespace ReportGenerator{
 		private System.Windows.Forms.Label label4;
 		private System.Windows.Forms.RadioButton radioFormSheet;
 		
+		private System.Windows.Forms.ErrorProvider errorProvider;
+		
 		ReportGenerator generator;
 		Properties customizer;
 	
@@ -47,12 +50,24 @@ namespace ReportGenerator{
 		
 		public BaseSettingsPanel(){	
 			InitializeComponent();
-			Localise();
+			errorProvider = new ErrorProvider();
+			errorProvider.ContainerControl = this;
+			this.txtFileName.KeyUp += new KeyEventHandler(OnKeyUp);
 			
+			Localise();
 			DoInit();
 			base.VisibleChanged += new EventHandler (ChangedEvent );
 		}
 		
+		private void OnKeyUp (object sender,KeyEventArgs e) {
+			if (this.txtFileName.Text.Length == 0) {
+				this.errorProvider.SetError(this.txtFileName,"aaaaa");
+				this.EnableNext = false;
+			}else {
+				this.errorProvider.SetError(this.txtFileName,"");
+			}
+		}
+		
 		private void Localise() {
 			this.radioFormSheet.Text = ResourceService.GetString("SharpReport.Wizard.BaseSettings.ReportModel.FormSheet");
 			
@@ -103,11 +118,8 @@ namespace ReportGenerator{
 		void DoInit(){
 			txtFileName.Text = GlobalValues.SharpReportPlainFileName;
 			txtReportName.Text = GlobalValues.SharpReportStandartFileName;
-					
-			cboReportType.Items.AddRange(Enum.GetNames (typeof(GlobalEnums.enmReportType)));
-			cboReportType.SelectedIndex = cboReportType.FindString(GlobalEnums.enmReportType.DataReport.ToString());
-			cboGraphicsUnit.Items.Add (GraphicsUnit.Millimeter);
-			cboGraphicsUnit.Items.Add (GraphicsUnit.Inch);
+			this.cboGraphicsUnit.Items.AddRange(Enum.GetNames(typeof (GraphicsUnit)));
+			                                    
 			cboGraphicsUnit.SelectedIndex = cboGraphicsUnit.FindString(GraphicsUnit.Millimeter.ToString());
 			
 			this.radioPullModell.Checked = true;
@@ -115,15 +127,20 @@ namespace ReportGenerator{
 		}
 	
 		void ChangedEvent(object sender, EventArgs e){
-			
 			if (initDone) {
 				generator.ReportName = txtReportName.Text;
-				generator.FileName = txtFileName.Text;
+				
+				if (!this.txtFileName.Text.EndsWith(GlobalValues.SharpReportExtension)){
+					generator.FileName = txtFileName.Text + GlobalValues.SharpReportExtension;
+				} else {
+					generator.FileName = txtFileName.Text;
+				}
+				
 				generator.Path = this.txtPath.Text;
-				generator.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit),this.cboGraphicsUnit.Text);
+				generator.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit),
+				                                                  this.cboGraphicsUnit.Text);
 				SetSuccessor (this,new EventArgs());
 			}
-			
 		}
 		
 		
@@ -155,21 +172,16 @@ namespace ReportGenerator{
 		
 		///<summary>Browse for Report Folder</summary>
 		void Button1Click(object sender, System.EventArgs e) {
-			try {
-				ICSharpCode.SharpDevelop.Gui.FolderDialog ff = new ICSharpCode.SharpDevelop.Gui.FolderDialog();
-				ff.DisplayDialog(String.Empty);
-				if (!String.IsNullOrEmpty(ff.Path)) {
-					if (!ff.Path.EndsWith(@"\")){             
-						this.txtPath.Text = ff.Path + @"\";
-					} else {
-						
-						this.txtPath.Text = ff.Path;
-					}
-					generator.Path = this.txtPath.Text;
+			
+			ICSharpCode.SharpDevelop.Gui.FolderDialog ff = new ICSharpCode.SharpDevelop.Gui.FolderDialog();
+			ff.DisplayDialog(String.Empty);
+			if (!String.IsNullOrEmpty(ff.Path)) {
+				if (!ff.Path.EndsWith(@"\")){
+					this.txtPath.Text = ff.Path + @"\";
+				} else {
+					this.txtPath.Text = ff.Path;
 				}
-				
-			} catch (Exception ) {
-				throw ;
+				generator.Path = this.txtPath.Text;
 			}
 		}
 		
@@ -190,7 +202,7 @@ namespace ReportGenerator{
 			this.txtPath = new System.Windows.Forms.TextBox();
 			this.txtFileName = new System.Windows.Forms.TextBox();
 			this.cboGraphicsUnit = new System.Windows.Forms.ComboBox();
-			this.cboReportType = new System.Windows.Forms.ComboBox();
+//			this.cboReportType = new System.Windows.Forms.ComboBox();
 			this.txtReportName = new System.Windows.Forms.TextBox();
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
 			this.groupBox2 = new System.Windows.Forms.GroupBox();
@@ -271,16 +283,19 @@ namespace ReportGenerator{
 			this.cboGraphicsUnit.Size = new System.Drawing.Size(248, 21);
 			this.cboGraphicsUnit.TabIndex = 17;
 			this.cboGraphicsUnit.TextChanged += new System.EventHandler(this.ChangedEvent);
+			this.cboGraphicsUnit.DropDownStyle = ComboBoxStyle.DropDownList;
 			// 
 			// cboReportType
 			// 
+			/*
 			this.cboReportType.Location = new System.Drawing.Point(112, 120);
 			this.cboReportType.Name = "cboReportType";
 			this.cboReportType.Size = new System.Drawing.Size(248, 21);
 			this.cboReportType.TabIndex = 16;
 			this.cboReportType.Visible = false;
 			this.cboReportType.SelectedIndexChanged += new System.EventHandler(this.ChangedEvent);
-			// 
+*/			
+// 
 			// txtReportName
 			// 
 			this.txtReportName.Location = new System.Drawing.Point(120, 40);
@@ -295,7 +310,7 @@ namespace ReportGenerator{
 			this.groupBox1.Controls.Add(this.groupBox2);
 			this.groupBox1.Controls.Add(this.button1);
 			this.groupBox1.Controls.Add(this.cboGraphicsUnit);
-			this.groupBox1.Controls.Add(this.cboReportType);
+//			this.groupBox1.Controls.Add(this.cboReportType);
 			this.groupBox1.Controls.Add(this.label4);
 			this.groupBox1.Controls.Add(this.label3);
 			this.groupBox1.Controls.Add(this.txtPath);
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/MiscActions.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/MiscActions.cs
index 722e2cba64..4539bb4d25 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/MiscActions.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/MiscActions.cs
@@ -905,9 +905,10 @@ namespace ICSharpCode.TextEditor.Actions
 	{
 		public override void Execute(TextArea textArea)
 		{
-			if (textArea.TextView.Highlight != null) {
-				Point p1 = new Point(textArea.TextView.Highlight.CloseBrace.X + 1, textArea.TextView.Highlight.CloseBrace.Y);
-				Point p2 = new Point(textArea.TextView.Highlight.OpenBrace.X + 1, textArea.TextView.Highlight.OpenBrace.Y);
+			Highlight highlight = textArea.FindMatchingBracketHighlight();
+			if (highlight != null) {
+				Point p1 = new Point(highlight.CloseBrace.X + 1, highlight.CloseBrace.Y);
+				Point p2 = new Point(highlight.OpenBrace.X + 1, highlight.OpenBrace.Y);
 				if (p1 == textArea.Caret.Position) {
 					if (textArea.Document.TextEditorProperties.BracketMatchingStyle == BracketMatchingStyle.After) {
 						textArea.Caret.Position = p2;
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
index 9c0f97f8a8..ec28525d6e 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
@@ -229,42 +229,39 @@ namespace ICSharpCode.TextEditor
 				textView.Highlight = null;
 				return;
 			}
-			bool changed = false;
-			if (caret.Offset == 0) {
-				if (textView.Highlight != null) {
-					int line  = textView.Highlight.OpenBrace.Y;
-					int line2 = textView.Highlight.CloseBrace.Y;
-					textView.Highlight = null;
-					UpdateLine(line);
-					UpdateLine(line2);
-				}
-				return;
+			int oldLine1 = -1, oldLine2 = -1;
+			if (textView.Highlight != null && textView.Highlight.OpenBrace.Y >=0 && textView.Highlight.OpenBrace.Y < Document.TotalNumberOfLines) {
+				oldLine1 = textView.Highlight.OpenBrace.Y;
+			}
+			if (textView.Highlight != null && textView.Highlight.CloseBrace.Y >=0 && textView.Highlight.CloseBrace.Y < Document.TotalNumberOfLines) {
+				oldLine2 = textView.Highlight.CloseBrace.Y;
 			}
+			textView.Highlight = FindMatchingBracketHighlight();
+			if (oldLine1 >= 0)
+				UpdateLine(oldLine1);
+			if (oldLine2 >= 0 && oldLine2 != oldLine1)
+				UpdateLine(oldLine2);
+			if (textView.Highlight != null) {
+				int newLine1 = textView.Highlight.OpenBrace.Y;
+				int newLine2 = textView.Highlight.CloseBrace.Y;
+				if (newLine1 != oldLine1 && newLine1 != oldLine2)
+					UpdateLine(newLine1);
+				if (newLine2 != oldLine1 && newLine2 != oldLine2 && newLine2 != newLine1)
+					UpdateLine(newLine2);
+			}
+		}
+		
+		public Highlight FindMatchingBracketHighlight()
+		{
+			if (Caret.Offset == 0)
+				return null;
 			foreach (BracketHighlightingSheme bracketsheme in bracketshemes) {
-//				if (bracketsheme.IsInside(textareapainter.Document, textareapainter.Document.Caret.Offset)) {
 				Highlight highlight = bracketsheme.GetHighlight(Document, Caret.Offset - 1);
-				if (textView.Highlight != null && textView.Highlight.OpenBrace.Y >=0 && textView.Highlight.OpenBrace.Y < Document.TotalNumberOfLines) {
-					UpdateLine(textView.Highlight.OpenBrace.Y);
-				}
-				if (textView.Highlight != null && textView.Highlight.CloseBrace.Y >=0 && textView.Highlight.CloseBrace.Y < Document.TotalNumberOfLines) {
-					UpdateLine(textView.Highlight.CloseBrace.Y);
-				}
-				textView.Highlight = highlight;
 				if (highlight != null) {
-					changed = true;
-					break;
-				}
-//				}
-			}
-			if (changed || textView.Highlight != null) {
-				int line = textView.Highlight.OpenBrace.Y;
-				int line2 = textView.Highlight.CloseBrace.Y;
-				if (!changed) {
-					textView.Highlight = null;
+					return highlight;
 				}
-				UpdateLine(line);
-				UpdateLine(line2);
 			}
+			return null;
 		}
 		
 		public void SetDesiredColumn()
diff --git a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs
index f97d446dd2..ea4659dfb3 100644
--- a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs
@@ -468,7 +468,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		#region Type level
 		public object Visit(FieldDeclaration fieldDeclaration, object data)
 		{
-			// TODO: use FieldDeclaration.GetTypeForField and VB.NET fields aren't that easy....
 			if (!fieldDeclaration.TypeReference.IsNull) {
 				VisitAttributes(fieldDeclaration.Attributes, data);
 				outputFormatter.Indent();
@@ -479,13 +478,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.PrintToken(Tokens.Semicolon);
 				outputFormatter.NewLine();
 			} else {
-				foreach (VariableDeclaration varDecl in fieldDeclaration.Fields) {
+				for (int i = 0; i < fieldDeclaration.Fields.Count; i++) {
 					VisitAttributes(fieldDeclaration.Attributes, data);
 					outputFormatter.Indent();
 					OutputModifier(fieldDeclaration.Modifier);
-					nodeTracker.TrackedVisit(varDecl.TypeReference, data);
+					nodeTracker.TrackedVisit(fieldDeclaration.GetTypeForField(i), data);
 					outputFormatter.Space();
-					nodeTracker.TrackedVisit(varDecl, data);
+					nodeTracker.TrackedVisit(fieldDeclaration.Fields[i], data);
 					outputFormatter.PrintToken(Tokens.Semicolon);
 					outputFormatter.NewLine();
 				}
@@ -868,7 +867,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			if (blockStatement.IsNull) {
 				outputFormatter.PrintToken(Tokens.Semicolon);
 				outputFormatter.NewLine();
-				nodeTracker.EndNode(blockStatement);
 			} else {
 				outputFormatter.BeginBrace(braceStyle);
 				foreach (Statement stmt in blockStatement.Children) {
@@ -877,9 +875,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					if (!outputFormatter.LastCharacterIsNewLine)
 						outputFormatter.NewLine();
 				}
-				nodeTracker.EndNode(blockStatement);
 				outputFormatter.EndBrace();
 			}
+			nodeTracker.EndNode(blockStatement);
 		}
 		
 		public object Visit(BlockStatement blockStatement, object data)
@@ -999,7 +997,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					outputFormatter.Indent();
 				}
 				OutputModifier(localVariableDeclaration.Modifier);
-				nodeTracker.TrackedVisit(localVariableDeclaration.GetTypeForVariable(i), data);
+				nodeTracker.TrackedVisit(localVariableDeclaration.GetTypeForVariable(i) ?? new TypeReference("object"), data);
 				outputFormatter.Space();
 				nodeTracker.TrackedVisit(v, data);
 				outputFormatter.PrintToken(Tokens.Semicolon);
@@ -1240,6 +1238,30 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				nodeTracker.TrackedVisit(caseLabel.Label, data);
 			}
 			outputFormatter.PrintToken(Tokens.Colon);
+			if (!caseLabel.ToExpression.IsNull) {
+				PrimitiveExpression pl = caseLabel.Label as PrimitiveExpression;
+				PrimitiveExpression pt = caseLabel.ToExpression as PrimitiveExpression;
+				if (pl != null && pt != null && pl.Value is int && pt.Value is int) {
+					int plv = (int)pl.Value;
+					int prv = (int)pt.Value;
+					if (plv < prv && plv + 12 > prv) {
+						for (int i = plv + 1; i <= prv; i++) {
+							outputFormatter.NewLine();
+							outputFormatter.Indent();
+							outputFormatter.PrintToken(Tokens.Case);
+							outputFormatter.Space();
+							outputFormatter.PrintText(i.ToString(NumberFormatInfo.InvariantInfo));
+							outputFormatter.PrintToken(Tokens.Colon);
+						}
+					} else {
+						outputFormatter.PrintText(" // TODO: to ");
+						nodeTracker.TrackedVisit(caseLabel.ToExpression, data);
+					}
+				} else {
+					outputFormatter.PrintText(" // TODO: to ");
+					nodeTracker.TrackedVisit(caseLabel.ToExpression, data);
+				}
+			}
 			outputFormatter.NewLine();
 			return null;
 		}
@@ -1303,9 +1325,18 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			
 			if (doLoopStatement.ConditionType == ConditionType.Until) {
 				outputFormatter.PrintToken(Tokens.Not);
+				outputFormatter.PrintToken(Tokens.OpenParenthesis);
+			}
+			
+			if (doLoopStatement.Condition.IsNull) {
+				outputFormatter.PrintToken(Tokens.True);
+			} else {
+				nodeTracker.TrackedVisit(doLoopStatement.Condition, null);
 			}
 			
-			nodeTracker.TrackedVisit(doLoopStatement.Condition, null);
+			if (doLoopStatement.ConditionType == ConditionType.Until) {
+				outputFormatter.PrintToken(Tokens.CloseParenthesis);
+			}
 			outputFormatter.PrintToken(Tokens.CloseParenthesis);
 		}
 		
@@ -1321,11 +1352,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.PrintToken(Tokens.Do);
 			}
 			
-			++outputFormatter.IndentationLevel;
 			WriteEmbeddedStatement(doLoopStatement.EmbeddedStatement);
-			--outputFormatter.IndentationLevel;
 			
 			if (doLoopStatement.ConditionPosition == ConditionPosition.End) {
+				outputFormatter.Indent();
 				PrintLoopCheck(doLoopStatement);
 				outputFormatter.PrintToken(Tokens.Semicolon);
 				outputFormatter.NewLine();
@@ -1495,7 +1525,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.PrintToken(Tokens.Break);
 			}
 			outputFormatter.PrintToken(Tokens.Semicolon);
-			outputFormatter.PrintText("// might not be correct. Was : Exit " + exitStatement.ExitType);
+			outputFormatter.PrintText(" // TODO: might not be correct. Was : Exit " + exitStatement.ExitType);
 			outputFormatter.NewLine();
 			return null;
 		}
@@ -1503,6 +1533,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		public object Visit(ForNextStatement forNextStatement, object data)
 		{
 			outputFormatter.PrintToken(Tokens.For);
+			outputFormatter.Space();
 			outputFormatter.PrintToken(Tokens.OpenParenthesis);
 			if (!forNextStatement.TypeReference.IsNull) {
 				nodeTracker.TrackedVisit(forNextStatement.TypeReference, data);
@@ -1518,7 +1549,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			outputFormatter.PrintIdentifier(forNextStatement.VariableName);
 			outputFormatter.Space();
 			PrimitiveExpression pe = forNextStatement.Step as PrimitiveExpression;
-			if (pe == null || !(pe.Value is int) || ((int)pe.Value) >= 0)
+			if ((pe == null || !(pe.Value is int) || ((int)pe.Value) >= 0)
+			    && !(forNextStatement.Step is UnaryOperatorExpression))
 				outputFormatter.PrintToken(Tokens.LessEqual);
 			else
 				outputFormatter.PrintToken(Tokens.GreaterEqual);
@@ -1537,7 +1569,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			}
 			outputFormatter.PrintToken(Tokens.CloseParenthesis);
 			
-			return nodeTracker.TrackedVisit(forNextStatement.EmbeddedStatement, data);
+			WriteEmbeddedStatement(forNextStatement.EmbeddedStatement);
+			return null;
 		}
 		#endregion
 		
@@ -1989,6 +2022,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					outputFormatter.PrintToken(Tokens.TimesAssign);
 					break;
 				case AssignmentOperatorType.Divide:
+				case AssignmentOperatorType.DivideInteger:
 					outputFormatter.PrintToken(Tokens.DivAssign);
 					break;
 				case AssignmentOperatorType.ShiftLeft:
diff --git a/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs
index c0765d4a14..08df734e50 100644
--- a/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs
@@ -215,6 +215,10 @@ namespace ICSharpCode.NRefactory.Parser
 				}
 				TypeReference fieldType = fieldDeclaration.GetTypeForField(i);
 				
+				if (fieldType.IsNull) {
+					fieldType = new TypeReference(typeDeclarations.Peek().Name);
+				}
+				
 				CodeMemberField memberField = new CodeMemberField(ConvType(fieldType), field.Name);
 				memberField.Attributes = ConvMemberAttributes(fieldDeclaration.Modifier);
 				if (!field.Initializer.IsNull) {
@@ -283,7 +287,7 @@ namespace ICSharpCode.NRefactory.Parser
 			CodeVariableDeclarationStatement declStmt = null;
 			
 			for (int i = 0; i < localVariableDeclaration.Variables.Count; ++i) {
-				CodeTypeReference type = ConvType(localVariableDeclaration.GetTypeForVariable(i));
+				CodeTypeReference type = ConvType(localVariableDeclaration.GetTypeForVariable(i) ?? new TypeReference("object"));
 				VariableDeclaration var = (VariableDeclaration)localVariableDeclaration.Variables[i];
 				if (!var.Initializer.IsNull) {
 					declStmt = new CodeVariableDeclarationStatement(type,
diff --git a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs
index ee05bef1fc..bccd95799e 100644
--- a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs
@@ -309,7 +309,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			VisitAttributes(typeDeclaration.Attributes, data);
 			
 			outputFormatter.Indent();
-			OutputModifier(typeDeclaration.Modifier);
+			OutputModifier(typeDeclaration.Modifier, true);
 			
 			int typeToken = GetTypeToken(typeDeclaration);
 			outputFormatter.PrintToken(typeToken);
@@ -330,13 +330,17 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			}
 			
 			outputFormatter.NewLine();
+			++outputFormatter.IndentationLevel;
 			
 			if (typeDeclaration.BaseTypes != null && typeDeclaration.Type != ClassType.Enum) {
 				foreach (TypeReference baseTypeRef in typeDeclaration.BaseTypes) {
 					outputFormatter.Indent();
 					
 					string baseType = baseTypeRef.Type;
-					bool baseTypeIsInterface = baseType.StartsWith("I") && (baseType.Length <= 1 || Char.IsUpper(baseType[1]));
+					if (baseType.IndexOf('.') >= 0) {
+						baseType = baseType.Substring(baseType.LastIndexOf('.') + 1);
+					}
+					bool baseTypeIsInterface = baseType.Length >= 2 && baseType[0] == 'I' && Char.IsUpper(baseType[1]);
 					
 					if (!baseTypeIsInterface || typeDeclaration.Type == ClassType.Interface) {
 						outputFormatter.PrintToken(Tokens.Inherits);
@@ -349,7 +353,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				}
 			}
 			
-			++outputFormatter.IndentationLevel;
 			TypeDeclaration oldType = currentType;
 			currentType = typeDeclaration;
 			
@@ -409,7 +412,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		public object Visit(DelegateDeclaration delegateDeclaration, object data)
 		{
 			VisitAttributes(delegateDeclaration.Attributes, data);
-			OutputModifier(delegateDeclaration.Modifier);
+			OutputModifier(delegateDeclaration.Modifier, true);
 			outputFormatter.PrintToken(Tokens.Delegate);
 			outputFormatter.Space();
 			
@@ -485,6 +488,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			if (fieldDeclaration.Modifier == Modifier.None) {
 				outputFormatter.PrintToken(Tokens.Private);
 				outputFormatter.Space();
+			} else if (fieldDeclaration.Modifier == Modifier.Dim) {
+				outputFormatter.PrintToken(Tokens.Dim);
+				outputFormatter.Space();
 			} else {
 				OutputModifier(fieldDeclaration.Modifier);
 			}
@@ -500,14 +506,24 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		public object Visit(VariableDeclaration variableDeclaration, object data)
 		{
 			outputFormatter.PrintIdentifier(variableDeclaration.Name);
-			outputFormatter.Space();
-			outputFormatter.PrintToken(Tokens.As);
-			outputFormatter.Space();
 			
-			if (variableDeclaration.TypeReference.IsNull && currentVariableType != null) {
-				nodeTracker.TrackedVisit(currentVariableType, data);
-			} else {
-				nodeTracker.TrackedVisit(variableDeclaration.TypeReference, data);
+			TypeReference varType = currentVariableType;
+			if (varType != null && varType.IsNull)
+				varType = null;
+			if (varType == null && !variableDeclaration.TypeReference.IsNull)
+				varType = variableDeclaration.TypeReference;
+			
+			if (varType != null) {
+				outputFormatter.Space();
+				outputFormatter.PrintToken(Tokens.As);
+				outputFormatter.Space();
+				ObjectCreateExpression init = variableDeclaration.Initializer as ObjectCreateExpression;
+				if (init != null && TypeReference.AreEqualReferences(init.CreateType, varType)) {
+					nodeTracker.TrackedVisit(variableDeclaration.Initializer, data);
+					return null;
+				} else {
+					nodeTracker.TrackedVisit(varType, data);
+				}
 			}
 			
 			if (!variableDeclaration.Initializer.IsNull) {
@@ -811,9 +827,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			outputFormatter.NewLine();
 			
 			if (!IsAbstract(methodDeclaration)) {
+				nodeTracker.BeginNode(methodDeclaration.Body);
 				++outputFormatter.IndentationLevel;
 				exitTokenStack.Push(isSub ? Tokens.Sub : Tokens.Function);
-				nodeTracker.TrackedVisit(methodDeclaration.Body, data);
+				methodDeclaration.Body.AcceptVisitor(this, data);
 				exitTokenStack.Pop();
 				--outputFormatter.IndentationLevel;
 				
@@ -826,6 +843,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					outputFormatter.PrintToken(Tokens.Function);
 				}
 				outputFormatter.NewLine();
+				nodeTracker.EndNode(methodDeclaration.Body);
 			}
 			return null;
 		}
@@ -1437,6 +1455,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			exitTokenStack.Push(Tokens.Select);
 			outputFormatter.PrintToken(Tokens.Select);
 			outputFormatter.Space();
+			outputFormatter.PrintToken(Tokens.Case);
+			outputFormatter.Space();
 			nodeTracker.TrackedVisit(switchStatement.SwitchExpression, data);
 			outputFormatter.NewLine();
 			++outputFormatter.IndentationLevel;
@@ -1593,7 +1613,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			PrintIndentedBlock(doLoopStatement.EmbeddedStatement);
 			
 			outputFormatter.Indent();
-			if (doLoopStatement.ConditionType == ConditionType.While) {
+			if (doLoopStatement.ConditionPosition == ConditionPosition.Start && doLoopStatement.ConditionType == ConditionType.While) {
 				outputFormatter.PrintToken(Tokens.End);
 				outputFormatter.Space();
 				outputFormatter.PrintToken(Tokens.While);
@@ -1601,7 +1621,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.PrintToken(Tokens.Loop);
 			}
 			
-			if (doLoopStatement.ConditionPosition == ConditionPosition.End) {
+			if (doLoopStatement.ConditionPosition == ConditionPosition.End && !doLoopStatement.Condition.IsNull) {
 				outputFormatter.Space();
 				switch (doLoopStatement.ConditionType) {
 					case ConditionType.While:
@@ -2040,6 +2060,16 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					outputFormatter.Space();
 					nodeTracker.TrackedVisit(binaryOperatorExpression.Right, data);
 					return null;
+				case BinaryOperatorType.NullCoalescing:
+					outputFormatter.PrintText("IIf(");
+					nodeTracker.TrackedVisit(binaryOperatorExpression.Left, data);
+					outputFormatter.PrintText(" Is Nothing, ");
+					nodeTracker.TrackedVisit(binaryOperatorExpression.Right, data);
+					outputFormatter.PrintToken(Tokens.Comma);
+					outputFormatter.Space();
+					nodeTracker.TrackedVisit(binaryOperatorExpression.Left, data);
+					outputFormatter.PrintToken(Tokens.CloseParenthesis);
+					return null;
 				case BinaryOperatorType.LessThan:
 					op = Tokens.LessThan;
 					break;
@@ -2117,13 +2147,11 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					
 				case UnaryOperatorType.Minus:
 					outputFormatter.PrintToken(Tokens.Minus);
-					outputFormatter.Space();
 					nodeTracker.TrackedVisit(unaryOperatorExpression.Expression, data);
 					return null;
 					
 				case UnaryOperatorType.Plus:
 					outputFormatter.PrintToken(Tokens.Plus);
-					outputFormatter.Space();
 					nodeTracker.TrackedVisit(unaryOperatorExpression.Expression, data);
 					return null;
 					
@@ -2144,7 +2172,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 					return null;
 					
 				case UnaryOperatorType.Star:
+					outputFormatter.PrintToken(Tokens.Times);
+					break;
 				case UnaryOperatorType.BitWiseAnd:
+					outputFormatter.PrintToken(Tokens.AddressOf);
 					break;
 			}
 			throw new System.NotSupportedException();
@@ -2514,6 +2545,11 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 		}
 		
 		void OutputModifier(Modifier modifier)
+		{
+			OutputModifier(modifier, false);
+		}
+		
+		void OutputModifier(Modifier modifier, bool forTypeDecl)
 		{
 			if ((modifier & Modifier.Public) == Modifier.Public) {
 				outputFormatter.PrintToken(Tokens.Public);
@@ -2543,7 +2579,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 				outputFormatter.Space();
 			}
 			if ((modifier & Modifier.Abstract) == Modifier.Abstract) {
-				outputFormatter.PrintToken(Tokens.MustOverride);
+				outputFormatter.PrintToken(forTypeDecl ? Tokens.MustInherit : Tokens.MustOverride);
 				outputFormatter.Space();
 			}
 			if ((modifier & Modifier.Override) == Modifier.Override) {
@@ -2558,7 +2594,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
 			}
 			
 			if ((modifier & Modifier.Sealed) == Modifier.Sealed) {
-				outputFormatter.PrintToken(Tokens.NotInheritable);
+				outputFormatter.PrintToken(forTypeDecl ? Tokens.NotInheritable : Tokens.NotOverridable);
 				outputFormatter.Space();
 			}
 			
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs
index fa8bcda977..84202d0c9c 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs
@@ -293,6 +293,29 @@ namespace ICSharpCode.NRefactory.Parser.AST
 			}
 			return b.ToString();
 		}
+		
+		public static bool AreEqualReferences(TypeReference a, TypeReference b)
+		{
+			if (a == b) return true;
+			if (a == null || b == null) return false;
+			if (a is InnerClassTypeReference) a = ((InnerClassTypeReference)a).CombineToNormalTypeReference();
+			if (b is InnerClassTypeReference) b = ((InnerClassTypeReference)b).CombineToNormalTypeReference();
+			if (a.systemType != b.systemType) return false;
+			if (a.pointerNestingLevel != b.pointerNestingLevel) return false;
+			if (a.IsArrayType != b.IsArrayType) return false;
+			if (a.IsArrayType) {
+				if (a.rankSpecifier.Length != b.rankSpecifier.Length) return false;
+				for (int i = 0; i < a.rankSpecifier.Length; i++) {
+					if (a.rankSpecifier[i] != b.rankSpecifier[i]) return false;
+				}
+			}
+			if (a.genericTypes.Count != b.genericTypes.Count) return false;
+			for (int i = 0; i < a.genericTypes.Count; i++) {
+				if (!AreEqualReferences(a.genericTypes[i], b.genericTypes[i]))
+					return false;
+			}
+			return true;
+		}
 	}
 	
 	public class NullTypeReference : TypeReference
@@ -305,7 +328,7 @@ namespace ICSharpCode.NRefactory.Parser.AST
 		}
 		public override object AcceptVisitor(IAstVisitor visitor, object data)
 		{
-			return data;
+			return null;
 		}
 		public static NullTypeReference Instance {
 			get {
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
index 06c9dd680e..347ae50baa 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
@@ -847,60 +847,60 @@ out expr);
 	}
 
 	void Expr(
-#line  2071 "cs.ATG" 
+#line  2076 "cs.ATG" 
 out Expression expr) {
 
-#line  2072 "cs.ATG" 
+#line  2077 "cs.ATG" 
 		expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; 
 		UnaryExpr(
-#line  2074 "cs.ATG" 
+#line  2079 "cs.ATG" 
 out expr);
 		if (StartOf(6)) {
 			AssignmentOperator(
-#line  2077 "cs.ATG" 
+#line  2082 "cs.ATG" 
 out op);
 			Expr(
-#line  2077 "cs.ATG" 
+#line  2082 "cs.ATG" 
 out expr1);
 
-#line  2077 "cs.ATG" 
+#line  2082 "cs.ATG" 
 			expr = new AssignmentExpression(expr, op, expr1); 
 		} else if (
-#line  2078 "cs.ATG" 
+#line  2083 "cs.ATG" 
 la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) {
 			AssignmentOperator(
-#line  2079 "cs.ATG" 
+#line  2084 "cs.ATG" 
 out op);
 			Expr(
-#line  2079 "cs.ATG" 
+#line  2084 "cs.ATG" 
 out expr1);
 
-#line  2079 "cs.ATG" 
+#line  2084 "cs.ATG" 
 			expr = new AssignmentExpression(expr, op, expr1); 
 		} else if (StartOf(7)) {
 			ConditionalOrExpr(
-#line  2081 "cs.ATG" 
+#line  2086 "cs.ATG" 
 ref expr);
 			if (la.kind == 13) {
 				lexer.NextToken();
 				Expr(
-#line  2082 "cs.ATG" 
+#line  2087 "cs.ATG" 
 out expr1);
 
-#line  2082 "cs.ATG" 
+#line  2087 "cs.ATG" 
 				expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); 
 			}
 			if (la.kind == 12) {
 				lexer.NextToken();
 				Expr(
-#line  2083 "cs.ATG" 
+#line  2088 "cs.ATG" 
 out expr1);
 				Expect(9);
 				Expr(
-#line  2083 "cs.ATG" 
+#line  2088 "cs.ATG" 
 out expr2);
 
-#line  2083 "cs.ATG" 
+#line  2088 "cs.ATG" 
 				expr = new ConditionalExpression(expr, expr1, expr2);  
 			}
 		} else SynErr(129);
@@ -1309,39 +1309,39 @@ templates);
 	}
 
 	void TypeParameterList(
-#line  2474 "cs.ATG" 
+#line  2477 "cs.ATG" 
 List<TemplateDefinition> templates) {
 
-#line  2476 "cs.ATG" 
+#line  2479 "cs.ATG" 
 		AttributeSection section;
 		List<AttributeSection> attributes = new List<AttributeSection>();
 		
 		Expect(23);
 		while (la.kind == 18) {
 			AttributeSection(
-#line  2480 "cs.ATG" 
+#line  2483 "cs.ATG" 
 out section);
 
-#line  2480 "cs.ATG" 
+#line  2483 "cs.ATG" 
 			attributes.Add(section); 
 		}
 		Expect(1);
 
-#line  2481 "cs.ATG" 
+#line  2484 "cs.ATG" 
 		templates.Add(new TemplateDefinition(t.val, attributes)); 
 		while (la.kind == 14) {
 			lexer.NextToken();
 			while (la.kind == 18) {
 				AttributeSection(
-#line  2482 "cs.ATG" 
+#line  2485 "cs.ATG" 
 out section);
 
-#line  2482 "cs.ATG" 
+#line  2485 "cs.ATG" 
 				attributes.Add(section); 
 			}
 			Expect(1);
 
-#line  2483 "cs.ATG" 
+#line  2486 "cs.ATG" 
 			templates.Add(new TemplateDefinition(t.val, attributes)); 
 		}
 		Expect(22);
@@ -1374,25 +1374,25 @@ out typeRef, false);
 	}
 
 	void TypeParameterConstraintsClause(
-#line  2487 "cs.ATG" 
+#line  2490 "cs.ATG" 
 List<TemplateDefinition> templates) {
 
-#line  2488 "cs.ATG" 
+#line  2491 "cs.ATG" 
 		string name = ""; TypeReference type; 
 		Expect(1);
 
-#line  2490 "cs.ATG" 
+#line  2493 "cs.ATG" 
 		if (t.val != "where") Error("where expected"); 
 		Expect(1);
 
-#line  2491 "cs.ATG" 
+#line  2494 "cs.ATG" 
 		name = t.val; 
 		Expect(9);
 		TypeParameterConstraintsClauseBase(
-#line  2493 "cs.ATG" 
+#line  2496 "cs.ATG" 
 out type);
 
-#line  2494 "cs.ATG" 
+#line  2497 "cs.ATG" 
 		TemplateDefinition td = null;
 		foreach (TemplateDefinition d in templates) {
 			if (d.Name == name) {
@@ -1405,10 +1405,10 @@ out type);
 		while (la.kind == 14) {
 			lexer.NextToken();
 			TypeParameterConstraintsClauseBase(
-#line  2503 "cs.ATG" 
+#line  2506 "cs.ATG" 
 out type);
 
-#line  2504 "cs.ATG" 
+#line  2507 "cs.ATG" 
 			td = null;
 			foreach (TemplateDefinition d in templates) {
 				if (d.Name == name) {
@@ -1744,33 +1744,33 @@ out r, canBeUnbound);
 	}
 
 	void TypeName(
-#line  2417 "cs.ATG" 
+#line  2420 "cs.ATG" 
 out TypeReference typeRef, bool canBeUnbound) {
 
-#line  2418 "cs.ATG" 
+#line  2421 "cs.ATG" 
 		List<TypeReference> typeArguments = null;
 		string alias = null;
 		string qualident;
 		
 		if (
-#line  2423 "cs.ATG" 
+#line  2426 "cs.ATG" 
 la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) {
 			lexer.NextToken();
 
-#line  2424 "cs.ATG" 
+#line  2427 "cs.ATG" 
 			alias = t.val; 
 			Expect(10);
 		}
 		Qualident(
-#line  2427 "cs.ATG" 
+#line  2430 "cs.ATG" 
 out qualident);
 		if (la.kind == 23) {
 			TypeArgumentList(
-#line  2428 "cs.ATG" 
+#line  2431 "cs.ATG" 
 out typeArguments, canBeUnbound);
 		}
 
-#line  2430 "cs.ATG" 
+#line  2433 "cs.ATG" 
 		if (alias == null) {
 		typeRef = new TypeReference(qualident, typeArguments);
 		} else if (alias == "global") {
@@ -1781,22 +1781,22 @@ out typeArguments, canBeUnbound);
 		}
 		
 		while (
-#line  2439 "cs.ATG" 
+#line  2442 "cs.ATG" 
 DotAndIdent()) {
 			Expect(15);
 
-#line  2440 "cs.ATG" 
+#line  2443 "cs.ATG" 
 			typeArguments = null; 
 			Qualident(
-#line  2441 "cs.ATG" 
+#line  2444 "cs.ATG" 
 out qualident);
 			if (la.kind == 23) {
 				TypeArgumentList(
-#line  2442 "cs.ATG" 
+#line  2445 "cs.ATG" 
 out typeArguments, canBeUnbound);
 			}
 
-#line  2443 "cs.ATG" 
+#line  2446 "cs.ATG" 
 			typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); 
 		}
 	}
@@ -2815,14 +2815,14 @@ out name);
 	}
 
 	void NullableQuestionMark(
-#line  2448 "cs.ATG" 
+#line  2451 "cs.ATG" 
 ref TypeReference typeRef) {
 
-#line  2449 "cs.ATG" 
+#line  2452 "cs.ATG" 
 		List<TypeReference> typeArguments = new List<TypeReference>(1); 
 		Expect(12);
 
-#line  2453 "cs.ATG" 
+#line  2456 "cs.ATG" 
 		if (typeRef != null) typeArguments.Add(typeRef);
 		typeRef = new TypeReference("System.Nullable", typeArguments);
 		
@@ -3050,161 +3050,161 @@ out expr);
 	}
 
 	void OverloadableOperator(
-#line  1722 "cs.ATG" 
+#line  1720 "cs.ATG" 
 out OverloadableOperatorType op) {
 
-#line  1723 "cs.ATG" 
+#line  1721 "cs.ATG" 
 		op = OverloadableOperatorType.None; 
 		switch (la.kind) {
 		case 4: {
 			lexer.NextToken();
 
-#line  1725 "cs.ATG" 
+#line  1723 "cs.ATG" 
 			op = OverloadableOperatorType.Add; 
 			break;
 		}
 		case 5: {
 			lexer.NextToken();
 
-#line  1726 "cs.ATG" 
+#line  1724 "cs.ATG" 
 			op = OverloadableOperatorType.Subtract; 
 			break;
 		}
 		case 24: {
 			lexer.NextToken();
 
-#line  1728 "cs.ATG" 
+#line  1726 "cs.ATG" 
 			op = OverloadableOperatorType.Not; 
 			break;
 		}
 		case 27: {
 			lexer.NextToken();
 
-#line  1729 "cs.ATG" 
+#line  1727 "cs.ATG" 
 			op = OverloadableOperatorType.BitNot; 
 			break;
 		}
 		case 31: {
 			lexer.NextToken();
 
-#line  1731 "cs.ATG" 
+#line  1729 "cs.ATG" 
 			op = OverloadableOperatorType.Increment; 
 			break;
 		}
 		case 32: {
 			lexer.NextToken();
 
-#line  1732 "cs.ATG" 
+#line  1730 "cs.ATG" 
 			op = OverloadableOperatorType.Decrement; 
 			break;
 		}
 		case 112: {
 			lexer.NextToken();
 
-#line  1734 "cs.ATG" 
+#line  1732 "cs.ATG" 
 			op = OverloadableOperatorType.IsTrue; 
 			break;
 		}
 		case 71: {
 			lexer.NextToken();
 
-#line  1735 "cs.ATG" 
+#line  1733 "cs.ATG" 
 			op = OverloadableOperatorType.IsFalse; 
 			break;
 		}
 		case 6: {
 			lexer.NextToken();
 
-#line  1737 "cs.ATG" 
+#line  1735 "cs.ATG" 
 			op = OverloadableOperatorType.Multiply; 
 			break;
 		}
 		case 7: {
 			lexer.NextToken();
 
-#line  1738 "cs.ATG" 
+#line  1736 "cs.ATG" 
 			op = OverloadableOperatorType.Divide; 
 			break;
 		}
 		case 8: {
 			lexer.NextToken();
 
-#line  1739 "cs.ATG" 
+#line  1737 "cs.ATG" 
 			op = OverloadableOperatorType.Modulus; 
 			break;
 		}
 		case 28: {
 			lexer.NextToken();
 
-#line  1741 "cs.ATG" 
+#line  1739 "cs.ATG" 
 			op = OverloadableOperatorType.BitwiseAnd; 
 			break;
 		}
 		case 29: {
 			lexer.NextToken();
 
-#line  1742 "cs.ATG" 
+#line  1740 "cs.ATG" 
 			op = OverloadableOperatorType.BitwiseOr; 
 			break;
 		}
 		case 30: {
 			lexer.NextToken();
 
-#line  1743 "cs.ATG" 
+#line  1741 "cs.ATG" 
 			op = OverloadableOperatorType.ExclusiveOr; 
 			break;
 		}
 		case 37: {
 			lexer.NextToken();
 
-#line  1745 "cs.ATG" 
+#line  1743 "cs.ATG" 
 			op = OverloadableOperatorType.ShiftLeft; 
 			break;
 		}
 		case 33: {
 			lexer.NextToken();
 
-#line  1746 "cs.ATG" 
+#line  1744 "cs.ATG" 
 			op = OverloadableOperatorType.Equality; 
 			break;
 		}
 		case 34: {
 			lexer.NextToken();
 
-#line  1747 "cs.ATG" 
+#line  1745 "cs.ATG" 
 			op = OverloadableOperatorType.InEquality; 
 			break;
 		}
 		case 23: {
 			lexer.NextToken();
 
-#line  1748 "cs.ATG" 
+#line  1746 "cs.ATG" 
 			op = OverloadableOperatorType.LessThan; 
 			break;
 		}
 		case 35: {
 			lexer.NextToken();
 
-#line  1749 "cs.ATG" 
+#line  1747 "cs.ATG" 
 			op = OverloadableOperatorType.GreaterThanOrEqual; 
 			break;
 		}
 		case 36: {
 			lexer.NextToken();
 
-#line  1750 "cs.ATG" 
+#line  1748 "cs.ATG" 
 			op = OverloadableOperatorType.LessThanOrEqual; 
 			break;
 		}
 		case 22: {
 			lexer.NextToken();
 
-#line  1751 "cs.ATG" 
+#line  1749 "cs.ATG" 
 			op = OverloadableOperatorType.GreaterThan; 
 			if (la.kind == 22) {
 				lexer.NextToken();
 
-#line  1751 "cs.ATG" 
+#line  1749 "cs.ATG" 
 				op = OverloadableOperatorType.ShiftRight; 
 			}
 			break;
@@ -3538,93 +3538,83 @@ out expr);
 
 #line  1717 "cs.ATG" 
 			initializerExpression = new StackAllocExpression(type, expr); 
-		} else if (la.kind == 62) {
-			lexer.NextToken();
-			Expect(20);
-			Type(
-#line  1719 "cs.ATG" 
-out type);
-			Expect(21);
-
-#line  1719 "cs.ATG" 
-			initializerExpression = new DefaultValueExpression(type); 
 		} else SynErr(166);
 	}
 
 	void Statement() {
 
-#line  1831 "cs.ATG" 
+#line  1829 "cs.ATG" 
 		TypeReference type;
 		Expression expr;
 		Statement stmt = null;
 		Point startPos = la.Location;
 		
 		if (
-#line  1839 "cs.ATG" 
+#line  1837 "cs.ATG" 
 IsLabel()) {
 			Expect(1);
 
-#line  1839 "cs.ATG" 
+#line  1837 "cs.ATG" 
 			compilationUnit.AddChild(new LabelStatement(t.val)); 
 			Expect(9);
 			Statement();
 		} else if (la.kind == 59) {
 			lexer.NextToken();
 			Type(
-#line  1842 "cs.ATG" 
+#line  1840 "cs.ATG" 
 out type);
 
-#line  1842 "cs.ATG" 
+#line  1840 "cs.ATG" 
 			LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifier.Const); string ident = null; var.StartLocation = t.Location; 
 			Expect(1);
 
-#line  1843 "cs.ATG" 
+#line  1841 "cs.ATG" 
 			ident = t.val; 
 			Expect(3);
 			Expr(
-#line  1844 "cs.ATG" 
+#line  1842 "cs.ATG" 
 out expr);
 
-#line  1844 "cs.ATG" 
+#line  1842 "cs.ATG" 
 			var.Variables.Add(new VariableDeclaration(ident, expr)); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Expect(1);
 
-#line  1845 "cs.ATG" 
+#line  1843 "cs.ATG" 
 				ident = t.val; 
 				Expect(3);
 				Expr(
-#line  1845 "cs.ATG" 
+#line  1843 "cs.ATG" 
 out expr);
 
-#line  1845 "cs.ATG" 
+#line  1843 "cs.ATG" 
 				var.Variables.Add(new VariableDeclaration(ident, expr)); 
 			}
 			Expect(11);
 
-#line  1846 "cs.ATG" 
+#line  1844 "cs.ATG" 
 			compilationUnit.AddChild(var); 
 		} else if (
-#line  1848 "cs.ATG" 
+#line  1846 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  1848 "cs.ATG" 
+#line  1846 "cs.ATG" 
 out stmt);
 			Expect(11);
 
-#line  1848 "cs.ATG" 
+#line  1846 "cs.ATG" 
 			compilationUnit.AddChild(stmt); 
 		} else if (StartOf(23)) {
 			EmbeddedStatement(
-#line  1849 "cs.ATG" 
+#line  1847 "cs.ATG" 
 out stmt);
 
-#line  1849 "cs.ATG" 
+#line  1847 "cs.ATG" 
 			compilationUnit.AddChild(stmt); 
 		} else SynErr(167);
 
-#line  1855 "cs.ATG" 
+#line  1853 "cs.ATG" 
 		if (stmt != null) {
 		stmt.StartLocation = startPos;
 		stmt.EndLocation = t.EndLocation;
@@ -3633,10 +3623,10 @@ out stmt);
 	}
 
 	void Argument(
-#line  1754 "cs.ATG" 
+#line  1752 "cs.ATG" 
 out Expression argumentexpr) {
 
-#line  1756 "cs.ATG" 
+#line  1754 "cs.ATG" 
 		Expression expr;
 		FieldDirection fd = FieldDirection.None;
 		
@@ -3644,48 +3634,48 @@ out Expression argumentexpr) {
 			if (la.kind == 99) {
 				lexer.NextToken();
 
-#line  1761 "cs.ATG" 
+#line  1759 "cs.ATG" 
 				fd = FieldDirection.Ref; 
 			} else {
 				lexer.NextToken();
 
-#line  1762 "cs.ATG" 
+#line  1760 "cs.ATG" 
 				fd = FieldDirection.Out; 
 			}
 		}
 		Expr(
-#line  1764 "cs.ATG" 
+#line  1762 "cs.ATG" 
 out expr);
 
-#line  1764 "cs.ATG" 
+#line  1762 "cs.ATG" 
 		argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; 
 	}
 
 	void ArrayInitializer(
-#line  1784 "cs.ATG" 
+#line  1782 "cs.ATG" 
 out Expression outExpr) {
 
-#line  1786 "cs.ATG" 
+#line  1784 "cs.ATG" 
 		Expression expr = null;
 		ArrayInitializerExpression initializer = new ArrayInitializerExpression();
 		
 		Expect(16);
 		if (StartOf(24)) {
 			VariableInitializer(
-#line  1791 "cs.ATG" 
+#line  1789 "cs.ATG" 
 out expr);
 
-#line  1792 "cs.ATG" 
+#line  1790 "cs.ATG" 
 			if (expr != null) { initializer.CreateExpressions.Add(expr); } 
 			while (
-#line  1793 "cs.ATG" 
+#line  1791 "cs.ATG" 
 NotFinalComma()) {
 				Expect(14);
 				VariableInitializer(
-#line  1794 "cs.ATG" 
+#line  1792 "cs.ATG" 
 out expr);
 
-#line  1795 "cs.ATG" 
+#line  1793 "cs.ATG" 
 				if (expr != null) { initializer.CreateExpressions.Add(expr); } 
 			}
 			if (la.kind == 14) {
@@ -3694,138 +3684,138 @@ out expr);
 		}
 		Expect(17);
 
-#line  1799 "cs.ATG" 
+#line  1797 "cs.ATG" 
 		outExpr = initializer; 
 	}
 
 	void AssignmentOperator(
-#line  1767 "cs.ATG" 
+#line  1765 "cs.ATG" 
 out AssignmentOperatorType op) {
 
-#line  1768 "cs.ATG" 
+#line  1766 "cs.ATG" 
 		op = AssignmentOperatorType.None; 
 		if (la.kind == 3) {
 			lexer.NextToken();
 
-#line  1770 "cs.ATG" 
+#line  1768 "cs.ATG" 
 			op = AssignmentOperatorType.Assign; 
 		} else if (la.kind == 38) {
 			lexer.NextToken();
 
-#line  1771 "cs.ATG" 
+#line  1769 "cs.ATG" 
 			op = AssignmentOperatorType.Add; 
 		} else if (la.kind == 39) {
 			lexer.NextToken();
 
-#line  1772 "cs.ATG" 
+#line  1770 "cs.ATG" 
 			op = AssignmentOperatorType.Subtract; 
 		} else if (la.kind == 40) {
 			lexer.NextToken();
 
-#line  1773 "cs.ATG" 
+#line  1771 "cs.ATG" 
 			op = AssignmentOperatorType.Multiply; 
 		} else if (la.kind == 41) {
 			lexer.NextToken();
 
-#line  1774 "cs.ATG" 
+#line  1772 "cs.ATG" 
 			op = AssignmentOperatorType.Divide; 
 		} else if (la.kind == 42) {
 			lexer.NextToken();
 
-#line  1775 "cs.ATG" 
+#line  1773 "cs.ATG" 
 			op = AssignmentOperatorType.Modulus; 
 		} else if (la.kind == 43) {
 			lexer.NextToken();
 
-#line  1776 "cs.ATG" 
+#line  1774 "cs.ATG" 
 			op = AssignmentOperatorType.BitwiseAnd; 
 		} else if (la.kind == 44) {
 			lexer.NextToken();
 
-#line  1777 "cs.ATG" 
+#line  1775 "cs.ATG" 
 			op = AssignmentOperatorType.BitwiseOr; 
 		} else if (la.kind == 45) {
 			lexer.NextToken();
 
-#line  1778 "cs.ATG" 
+#line  1776 "cs.ATG" 
 			op = AssignmentOperatorType.ExclusiveOr; 
 		} else if (la.kind == 46) {
 			lexer.NextToken();
 
-#line  1779 "cs.ATG" 
+#line  1777 "cs.ATG" 
 			op = AssignmentOperatorType.ShiftLeft; 
 		} else if (
-#line  1780 "cs.ATG" 
+#line  1778 "cs.ATG" 
 la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) {
 			Expect(22);
 			Expect(35);
 
-#line  1781 "cs.ATG" 
+#line  1779 "cs.ATG" 
 			op = AssignmentOperatorType.ShiftRight; 
 		} else SynErr(168);
 	}
 
 	void LocalVariableDecl(
-#line  1802 "cs.ATG" 
+#line  1800 "cs.ATG" 
 out Statement stmt) {
 
-#line  1804 "cs.ATG" 
+#line  1802 "cs.ATG" 
 		TypeReference type;
 		VariableDeclaration      var = null;
 		LocalVariableDeclaration localVariableDeclaration; 
 		
 		Type(
-#line  1809 "cs.ATG" 
+#line  1807 "cs.ATG" 
 out type);
 
-#line  1809 "cs.ATG" 
+#line  1807 "cs.ATG" 
 		localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; 
 		LocalVariableDeclarator(
-#line  1810 "cs.ATG" 
+#line  1808 "cs.ATG" 
 out var);
 
-#line  1810 "cs.ATG" 
+#line  1808 "cs.ATG" 
 		localVariableDeclaration.Variables.Add(var); 
 		while (la.kind == 14) {
 			lexer.NextToken();
 			LocalVariableDeclarator(
-#line  1811 "cs.ATG" 
+#line  1809 "cs.ATG" 
 out var);
 
-#line  1811 "cs.ATG" 
+#line  1809 "cs.ATG" 
 			localVariableDeclaration.Variables.Add(var); 
 		}
 
-#line  1812 "cs.ATG" 
+#line  1810 "cs.ATG" 
 		stmt = localVariableDeclaration; 
 	}
 
 	void LocalVariableDeclarator(
-#line  1815 "cs.ATG" 
+#line  1813 "cs.ATG" 
 out VariableDeclaration var) {
 
-#line  1816 "cs.ATG" 
+#line  1814 "cs.ATG" 
 		Expression expr = null; 
 		Expect(1);
 
-#line  1819 "cs.ATG" 
+#line  1817 "cs.ATG" 
 		var = new VariableDeclaration(t.val); 
 		if (la.kind == 3) {
 			lexer.NextToken();
 			VariableInitializer(
-#line  1819 "cs.ATG" 
+#line  1817 "cs.ATG" 
 out expr);
 
-#line  1819 "cs.ATG" 
+#line  1817 "cs.ATG" 
 			var.Initializer = expr; 
 		}
 	}
 
 	void EmbeddedStatement(
-#line  1862 "cs.ATG" 
+#line  1860 "cs.ATG" 
 out Statement statement) {
 
-#line  1864 "cs.ATG" 
+#line  1862 "cs.ATG" 
 		TypeReference type = null;
 		Expression expr = null;
 		Statement embeddedStatement = null;
@@ -3833,57 +3823,57 @@ out Statement statement) {
 		
 		if (la.kind == 16) {
 			Block(
-#line  1870 "cs.ATG" 
+#line  1868 "cs.ATG" 
 out statement);
 		} else if (la.kind == 11) {
 			lexer.NextToken();
 
-#line  1872 "cs.ATG" 
+#line  1870 "cs.ATG" 
 			statement = new EmptyStatement(); 
 		} else if (
-#line  1874 "cs.ATG" 
+#line  1872 "cs.ATG" 
 UnCheckedAndLBrace()) {
 
-#line  1874 "cs.ATG" 
+#line  1872 "cs.ATG" 
 			Statement block; bool isChecked = true; 
 			if (la.kind == 57) {
 				lexer.NextToken();
 			} else if (la.kind == 117) {
 				lexer.NextToken();
 
-#line  1875 "cs.ATG" 
+#line  1873 "cs.ATG" 
 				isChecked = false;
 			} else SynErr(169);
 			Block(
-#line  1876 "cs.ATG" 
+#line  1874 "cs.ATG" 
 out block);
 
-#line  1876 "cs.ATG" 
+#line  1874 "cs.ATG" 
 			statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); 
 		} else if (la.kind == 78) {
 			lexer.NextToken();
 
-#line  1878 "cs.ATG" 
+#line  1876 "cs.ATG" 
 			Statement elseStatement = null; 
 			Expect(20);
 			Expr(
-#line  1879 "cs.ATG" 
+#line  1877 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1880 "cs.ATG" 
+#line  1878 "cs.ATG" 
 out embeddedStatement);
 			if (la.kind == 66) {
 				lexer.NextToken();
 				EmbeddedStatement(
-#line  1881 "cs.ATG" 
+#line  1879 "cs.ATG" 
 out elseStatement);
 			}
 
-#line  1882 "cs.ATG" 
+#line  1880 "cs.ATG" 
 			statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); 
 
-#line  1883 "cs.ATG" 
+#line  1881 "cs.ATG" 
 			if (elseStatement is IfElseStatement && (elseStatement as IfElseStatement).TrueStatement.Count == 1) {
 			/* else if-section (otherwise we would have a BlockStatment) */
 			(statement as IfElseStatement).ElseIfSections.Add(
@@ -3895,104 +3885,99 @@ out elseStatement);
 		} else if (la.kind == 109) {
 			lexer.NextToken();
 
-#line  1891 "cs.ATG" 
+#line  1889 "cs.ATG" 
 			List<SwitchSection> switchSections = new List<SwitchSection>(); SwitchSection switchSection; 
 			Expect(20);
 			Expr(
-#line  1892 "cs.ATG" 
+#line  1890 "cs.ATG" 
 out expr);
 			Expect(21);
 			Expect(16);
-			while (la.kind == 54 || la.kind == 62) {
-				SwitchSection(
-#line  1893 "cs.ATG" 
-out switchSection);
-
-#line  1893 "cs.ATG" 
-				switchSections.Add(switchSection); 
-			}
+			SwitchSections(
+#line  1891 "cs.ATG" 
+switchSections);
 			Expect(17);
 
-#line  1894 "cs.ATG" 
+#line  1892 "cs.ATG" 
 			statement = new SwitchStatement(expr, switchSections); 
 		} else if (la.kind == 124) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1896 "cs.ATG" 
+#line  1894 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1898 "cs.ATG" 
+#line  1896 "cs.ATG" 
 out embeddedStatement);
 
-#line  1898 "cs.ATG" 
+#line  1896 "cs.ATG" 
 			statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start);
 		} else if (la.kind == 64) {
 			lexer.NextToken();
 			EmbeddedStatement(
-#line  1899 "cs.ATG" 
+#line  1897 "cs.ATG" 
 out embeddedStatement);
 			Expect(124);
 			Expect(20);
 			Expr(
-#line  1900 "cs.ATG" 
+#line  1898 "cs.ATG" 
 out expr);
 			Expect(21);
 			Expect(11);
 
-#line  1900 "cs.ATG" 
+#line  1898 "cs.ATG" 
 			statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); 
 		} else if (la.kind == 75) {
 			lexer.NextToken();
 
-#line  1901 "cs.ATG" 
+#line  1899 "cs.ATG" 
 			List<Statement> initializer = null; List<Statement> iterator = null; 
 			Expect(20);
 			if (StartOf(5)) {
 				ForInitializer(
-#line  1902 "cs.ATG" 
+#line  1900 "cs.ATG" 
 out initializer);
 			}
 			Expect(11);
 			if (StartOf(5)) {
 				Expr(
-#line  1903 "cs.ATG" 
+#line  1901 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 			if (StartOf(5)) {
 				ForIterator(
-#line  1904 "cs.ATG" 
+#line  1902 "cs.ATG" 
 out iterator);
 			}
 			Expect(21);
 			EmbeddedStatement(
-#line  1905 "cs.ATG" 
+#line  1903 "cs.ATG" 
 out embeddedStatement);
 
-#line  1905 "cs.ATG" 
+#line  1903 "cs.ATG" 
 			statement = new ForStatement(initializer, expr, iterator, embeddedStatement); 
 		} else if (la.kind == 76) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1906 "cs.ATG" 
+#line  1904 "cs.ATG" 
 out type);
 			Expect(1);
 
-#line  1906 "cs.ATG" 
+#line  1904 "cs.ATG" 
 			string varName = t.val; Point start = t.Location;
 			Expect(80);
 			Expr(
-#line  1907 "cs.ATG" 
+#line  1905 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1908 "cs.ATG" 
+#line  1906 "cs.ATG" 
 out embeddedStatement);
 
-#line  1908 "cs.ATG" 
+#line  1906 "cs.ATG" 
 			statement = new ForeachStatement(type, varName , expr, embeddedStatement); 
 			statement.EndLocation = t.EndLocation;
 			
@@ -4000,34 +3985,34 @@ out embeddedStatement);
 			lexer.NextToken();
 			Expect(11);
 
-#line  1912 "cs.ATG" 
+#line  1910 "cs.ATG" 
 			statement = new BreakStatement(); 
 		} else if (la.kind == 60) {
 			lexer.NextToken();
 			Expect(11);
 
-#line  1913 "cs.ATG" 
+#line  1911 "cs.ATG" 
 			statement = new ContinueStatement(); 
 		} else if (la.kind == 77) {
 			GotoStatement(
-#line  1914 "cs.ATG" 
+#line  1912 "cs.ATG" 
 out statement);
 		} else if (
-#line  1915 "cs.ATG" 
+#line  1913 "cs.ATG" 
 IsYieldStatement()) {
 			Expect(1);
 			if (la.kind == 100) {
 				lexer.NextToken();
 				Expr(
-#line  1915 "cs.ATG" 
+#line  1913 "cs.ATG" 
 out expr);
 
-#line  1915 "cs.ATG" 
+#line  1913 "cs.ATG" 
 				statement = new YieldStatement(new ReturnStatement(expr)); 
 			} else if (la.kind == 52) {
 				lexer.NextToken();
 
-#line  1916 "cs.ATG" 
+#line  1914 "cs.ATG" 
 				statement = new YieldStatement(new BreakStatement()); 
 			} else SynErr(170);
 			Expect(11);
@@ -4035,488 +4020,495 @@ out expr);
 			lexer.NextToken();
 			if (StartOf(5)) {
 				Expr(
-#line  1917 "cs.ATG" 
+#line  1915 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 
-#line  1917 "cs.ATG" 
+#line  1915 "cs.ATG" 
 			statement = new ReturnStatement(expr); 
 		} else if (la.kind == 111) {
 			lexer.NextToken();
 			if (StartOf(5)) {
 				Expr(
-#line  1918 "cs.ATG" 
+#line  1916 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 
-#line  1918 "cs.ATG" 
+#line  1916 "cs.ATG" 
 			statement = new ThrowStatement(expr); 
 		} else if (StartOf(5)) {
 			StatementExpr(
-#line  1921 "cs.ATG" 
+#line  1919 "cs.ATG" 
 out statement);
 			Expect(11);
 		} else if (la.kind == 113) {
 			TryStatement(
-#line  1923 "cs.ATG" 
+#line  1921 "cs.ATG" 
 out statement);
 		} else if (la.kind == 85) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1925 "cs.ATG" 
+#line  1923 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1926 "cs.ATG" 
+#line  1924 "cs.ATG" 
 out embeddedStatement);
 
-#line  1926 "cs.ATG" 
+#line  1924 "cs.ATG" 
 			statement = new LockStatement(expr, embeddedStatement); 
 		} else if (la.kind == 120) {
 
-#line  1928 "cs.ATG" 
+#line  1926 "cs.ATG" 
 			Statement resourceAcquisitionStmt = null; 
 			lexer.NextToken();
 			Expect(20);
 			ResourceAcquisition(
-#line  1930 "cs.ATG" 
+#line  1928 "cs.ATG" 
 out resourceAcquisitionStmt);
 			Expect(21);
 			EmbeddedStatement(
-#line  1931 "cs.ATG" 
+#line  1929 "cs.ATG" 
 out embeddedStatement);
 
-#line  1931 "cs.ATG" 
+#line  1929 "cs.ATG" 
 			statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); 
 		} else if (la.kind == 118) {
 			lexer.NextToken();
 			Block(
-#line  1933 "cs.ATG" 
+#line  1931 "cs.ATG" 
 out embeddedStatement);
 
-#line  1933 "cs.ATG" 
+#line  1931 "cs.ATG" 
 			statement = new UnsafeStatement(embeddedStatement); 
 		} else if (la.kind == 73) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1936 "cs.ATG" 
+#line  1934 "cs.ATG" 
 out type);
 
-#line  1936 "cs.ATG" 
+#line  1934 "cs.ATG" 
 			if (type.PointerNestingLevel == 0) Error("can only fix pointer types");
 			List<VariableDeclaration> pointerDeclarators = new List<VariableDeclaration>(1);
 			
 			Expect(1);
 
-#line  1939 "cs.ATG" 
+#line  1937 "cs.ATG" 
 			string identifier = t.val; 
 			Expect(3);
 			Expr(
-#line  1940 "cs.ATG" 
+#line  1938 "cs.ATG" 
 out expr);
 
-#line  1940 "cs.ATG" 
+#line  1938 "cs.ATG" 
 			pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Expect(1);
 
-#line  1942 "cs.ATG" 
+#line  1940 "cs.ATG" 
 				identifier = t.val; 
 				Expect(3);
 				Expr(
-#line  1943 "cs.ATG" 
+#line  1941 "cs.ATG" 
 out expr);
 
-#line  1943 "cs.ATG" 
+#line  1941 "cs.ATG" 
 				pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); 
 			}
 			Expect(21);
 			EmbeddedStatement(
-#line  1945 "cs.ATG" 
+#line  1943 "cs.ATG" 
 out embeddedStatement);
 
-#line  1945 "cs.ATG" 
+#line  1943 "cs.ATG" 
 			statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); 
 		} else SynErr(171);
 	}
 
-	void SwitchSection(
-#line  1967 "cs.ATG" 
-out SwitchSection stmt) {
+	void SwitchSections(
+#line  1965 "cs.ATG" 
+List<SwitchSection> switchSections) {
 
-#line  1969 "cs.ATG" 
+#line  1967 "cs.ATG" 
 		SwitchSection switchSection = new SwitchSection();
 		CaseLabel label;
 		
 		SwitchLabel(
-#line  1973 "cs.ATG" 
+#line  1971 "cs.ATG" 
 out label);
 
-#line  1973 "cs.ATG" 
+#line  1971 "cs.ATG" 
 		if (label != null) { switchSection.SwitchLabels.Add(label); } 
-		while (la.kind == 54 || la.kind == 62) {
-			SwitchLabel(
-#line  1975 "cs.ATG" 
+
+#line  1972 "cs.ATG" 
+		compilationUnit.BlockStart(switchSection); 
+		while (StartOf(25)) {
+			if (la.kind == 54 || la.kind == 62) {
+				SwitchLabel(
+#line  1974 "cs.ATG" 
 out label);
 
 #line  1975 "cs.ATG" 
-			if (label != null) { switchSection.SwitchLabels.Add(label); } 
-		}
-
-#line  1977 "cs.ATG" 
-		compilationUnit.BlockStart(switchSection); 
-		Statement();
-		while (StartOf(20)) {
-			Statement();
+				if (label != null) {
+				if (switchSection.Children.Count > 0) {
+					// open new section
+					compilationUnit.BlockEnd(); switchSections.Add(switchSection);
+					switchSection = new SwitchSection();
+					compilationUnit.BlockStart(switchSection);
+				}
+				switchSection.SwitchLabels.Add(label);
+				}
+				
+			} else {
+				Statement();
+			}
 		}
 
-#line  1980 "cs.ATG" 
-		compilationUnit.BlockEnd();
-		stmt = switchSection;
-		
+#line  1987 "cs.ATG" 
+		compilationUnit.BlockEnd(); switchSections.Add(switchSection); 
 	}
 
 	void ForInitializer(
-#line  1948 "cs.ATG" 
+#line  1946 "cs.ATG" 
 out List<Statement> initializer) {
 
-#line  1950 "cs.ATG" 
+#line  1948 "cs.ATG" 
 		Statement stmt; 
 		initializer = new List<Statement>();
 		
 		if (
-#line  1954 "cs.ATG" 
+#line  1952 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  1954 "cs.ATG" 
+#line  1952 "cs.ATG" 
 out stmt);
 
-#line  1954 "cs.ATG" 
+#line  1952 "cs.ATG" 
 			initializer.Add(stmt);
 		} else if (StartOf(5)) {
 			StatementExpr(
-#line  1955 "cs.ATG" 
+#line  1953 "cs.ATG" 
 out stmt);
 
-#line  1955 "cs.ATG" 
+#line  1953 "cs.ATG" 
 			initializer.Add(stmt);
 			while (la.kind == 14) {
 				lexer.NextToken();
 				StatementExpr(
-#line  1955 "cs.ATG" 
+#line  1953 "cs.ATG" 
 out stmt);
 
-#line  1955 "cs.ATG" 
+#line  1953 "cs.ATG" 
 				initializer.Add(stmt);
 			}
 		} else SynErr(172);
 	}
 
 	void ForIterator(
-#line  1958 "cs.ATG" 
+#line  1956 "cs.ATG" 
 out List<Statement> iterator) {
 
-#line  1960 "cs.ATG" 
+#line  1958 "cs.ATG" 
 		Statement stmt; 
 		iterator = new List<Statement>();
 		
 		StatementExpr(
-#line  1964 "cs.ATG" 
+#line  1962 "cs.ATG" 
 out stmt);
 
-#line  1964 "cs.ATG" 
+#line  1962 "cs.ATG" 
 		iterator.Add(stmt);
 		while (la.kind == 14) {
 			lexer.NextToken();
 			StatementExpr(
-#line  1964 "cs.ATG" 
+#line  1962 "cs.ATG" 
 out stmt);
 
-#line  1964 "cs.ATG" 
+#line  1962 "cs.ATG" 
 			iterator.Add(stmt); 
 		}
 	}
 
 	void GotoStatement(
-#line  2035 "cs.ATG" 
+#line  2040 "cs.ATG" 
 out Statement stmt) {
 
-#line  2036 "cs.ATG" 
+#line  2041 "cs.ATG" 
 		Expression expr; stmt = null; 
 		Expect(77);
 		if (la.kind == 1) {
 			lexer.NextToken();
 
-#line  2040 "cs.ATG" 
+#line  2045 "cs.ATG" 
 			stmt = new GotoStatement(t.val); 
 			Expect(11);
 		} else if (la.kind == 54) {
 			lexer.NextToken();
 			Expr(
-#line  2041 "cs.ATG" 
+#line  2046 "cs.ATG" 
 out expr);
 			Expect(11);
 
-#line  2041 "cs.ATG" 
+#line  2046 "cs.ATG" 
 			stmt = new GotoCaseStatement(expr); 
 		} else if (la.kind == 62) {
 			lexer.NextToken();
 			Expect(11);
 
-#line  2042 "cs.ATG" 
+#line  2047 "cs.ATG" 
 			stmt = new GotoCaseStatement(null); 
 		} else SynErr(173);
 	}
 
 	void StatementExpr(
-#line  2062 "cs.ATG" 
+#line  2067 "cs.ATG" 
 out Statement stmt) {
 
-#line  2063 "cs.ATG" 
+#line  2068 "cs.ATG" 
 		Expression expr; 
 		Expr(
-#line  2065 "cs.ATG" 
+#line  2070 "cs.ATG" 
 out expr);
 
-#line  2068 "cs.ATG" 
+#line  2073 "cs.ATG" 
 		stmt = new StatementExpression(expr); 
 	}
 
 	void TryStatement(
-#line  1992 "cs.ATG" 
+#line  1997 "cs.ATG" 
 out Statement tryStatement) {
 
-#line  1994 "cs.ATG" 
+#line  1999 "cs.ATG" 
 		Statement blockStmt = null, finallyStmt = null;
 		List<CatchClause> catchClauses = null;
 		
 		Expect(113);
 		Block(
-#line  1998 "cs.ATG" 
+#line  2003 "cs.ATG" 
 out blockStmt);
 		if (la.kind == 55) {
 			CatchClauses(
-#line  2000 "cs.ATG" 
+#line  2005 "cs.ATG" 
 out catchClauses);
 			if (la.kind == 72) {
 				lexer.NextToken();
 				Block(
-#line  2000 "cs.ATG" 
+#line  2005 "cs.ATG" 
 out finallyStmt);
 			}
 		} else if (la.kind == 72) {
 			lexer.NextToken();
 			Block(
-#line  2001 "cs.ATG" 
+#line  2006 "cs.ATG" 
 out finallyStmt);
 		} else SynErr(174);
 
-#line  2004 "cs.ATG" 
+#line  2009 "cs.ATG" 
 		tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt);
 			
 	}
 
 	void ResourceAcquisition(
-#line  2046 "cs.ATG" 
+#line  2051 "cs.ATG" 
 out Statement stmt) {
 
-#line  2048 "cs.ATG" 
+#line  2053 "cs.ATG" 
 		stmt = null;
 		Expression expr;
 		
 		if (
-#line  2053 "cs.ATG" 
+#line  2058 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  2053 "cs.ATG" 
+#line  2058 "cs.ATG" 
 out stmt);
 		} else if (StartOf(5)) {
 			Expr(
-#line  2054 "cs.ATG" 
+#line  2059 "cs.ATG" 
 out expr);
 
-#line  2058 "cs.ATG" 
+#line  2063 "cs.ATG" 
 			stmt = new StatementExpression(expr); 
 		} else SynErr(175);
 	}
 
 	void SwitchLabel(
-#line  1985 "cs.ATG" 
+#line  1990 "cs.ATG" 
 out CaseLabel label) {
 
-#line  1986 "cs.ATG" 
+#line  1991 "cs.ATG" 
 		Expression expr = null; label = null; 
 		if (la.kind == 54) {
 			lexer.NextToken();
 			Expr(
-#line  1988 "cs.ATG" 
+#line  1993 "cs.ATG" 
 out expr);
 			Expect(9);
 
-#line  1988 "cs.ATG" 
+#line  1993 "cs.ATG" 
 			label =  new CaseLabel(expr); 
 		} else if (la.kind == 62) {
 			lexer.NextToken();
 			Expect(9);
 
-#line  1989 "cs.ATG" 
+#line  1994 "cs.ATG" 
 			label =  new CaseLabel(); 
 		} else SynErr(176);
 	}
 
 	void CatchClauses(
-#line  2009 "cs.ATG" 
+#line  2014 "cs.ATG" 
 out List<CatchClause> catchClauses) {
 
-#line  2011 "cs.ATG" 
+#line  2016 "cs.ATG" 
 		catchClauses = new List<CatchClause>();
 		
 		Expect(55);
 
-#line  2014 "cs.ATG" 
+#line  2019 "cs.ATG" 
 		string identifier;
 		Statement stmt;
 		TypeReference typeRef;
 		
 		if (la.kind == 16) {
 			Block(
-#line  2020 "cs.ATG" 
+#line  2025 "cs.ATG" 
 out stmt);
 
-#line  2020 "cs.ATG" 
+#line  2025 "cs.ATG" 
 			catchClauses.Add(new CatchClause(stmt)); 
 		} else if (la.kind == 20) {
 			lexer.NextToken();
 			ClassType(
-#line  2022 "cs.ATG" 
+#line  2027 "cs.ATG" 
 out typeRef, false);
 
-#line  2022 "cs.ATG" 
+#line  2027 "cs.ATG" 
 			identifier = null; 
 			if (la.kind == 1) {
 				lexer.NextToken();
 
-#line  2023 "cs.ATG" 
+#line  2028 "cs.ATG" 
 				identifier = t.val; 
 			}
 			Expect(21);
 			Block(
-#line  2024 "cs.ATG" 
+#line  2029 "cs.ATG" 
 out stmt);
 
-#line  2025 "cs.ATG" 
+#line  2030 "cs.ATG" 
 			catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); 
 			while (
-#line  2026 "cs.ATG" 
+#line  2031 "cs.ATG" 
 IsTypedCatch()) {
 				Expect(55);
 				Expect(20);
 				ClassType(
-#line  2026 "cs.ATG" 
+#line  2031 "cs.ATG" 
 out typeRef, false);
 
-#line  2026 "cs.ATG" 
+#line  2031 "cs.ATG" 
 				identifier = null; 
 				if (la.kind == 1) {
 					lexer.NextToken();
 
-#line  2027 "cs.ATG" 
+#line  2032 "cs.ATG" 
 					identifier = t.val; 
 				}
 				Expect(21);
 				Block(
-#line  2028 "cs.ATG" 
+#line  2033 "cs.ATG" 
 out stmt);
 
-#line  2029 "cs.ATG" 
+#line  2034 "cs.ATG" 
 				catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); 
 			}
 			if (la.kind == 55) {
 				lexer.NextToken();
 				Block(
-#line  2031 "cs.ATG" 
+#line  2036 "cs.ATG" 
 out stmt);
 
-#line  2031 "cs.ATG" 
+#line  2036 "cs.ATG" 
 				catchClauses.Add(new CatchClause(stmt)); 
 			}
 		} else SynErr(177);
 	}
 
 	void UnaryExpr(
-#line  2089 "cs.ATG" 
+#line  2094 "cs.ATG" 
 out Expression uExpr) {
 
-#line  2091 "cs.ATG" 
+#line  2096 "cs.ATG" 
 		TypeReference type = null;
 		Expression expr;
 		ArrayList  expressions = new ArrayList();
 		uExpr = null;
 		
-		while (StartOf(25) || 
-#line  2113 "cs.ATG" 
+		while (StartOf(26) || 
+#line  2118 "cs.ATG" 
 IsTypeCast()) {
 			if (la.kind == 4) {
 				lexer.NextToken();
 
-#line  2100 "cs.ATG" 
+#line  2105 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); 
 			} else if (la.kind == 5) {
 				lexer.NextToken();
 
-#line  2101 "cs.ATG" 
+#line  2106 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); 
 			} else if (la.kind == 24) {
 				lexer.NextToken();
 
-#line  2102 "cs.ATG" 
+#line  2107 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); 
 			} else if (la.kind == 27) {
 				lexer.NextToken();
 
-#line  2103 "cs.ATG" 
+#line  2108 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); 
 			} else if (la.kind == 6) {
 				lexer.NextToken();
 
-#line  2104 "cs.ATG" 
+#line  2109 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); 
 			} else if (la.kind == 31) {
 				lexer.NextToken();
 
-#line  2105 "cs.ATG" 
+#line  2110 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); 
 			} else if (la.kind == 32) {
 				lexer.NextToken();
 
-#line  2106 "cs.ATG" 
+#line  2111 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); 
 			} else if (la.kind == 28) {
 				lexer.NextToken();
 
-#line  2107 "cs.ATG" 
+#line  2112 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); 
 			} else {
 				Expect(20);
 				Type(
-#line  2113 "cs.ATG" 
+#line  2118 "cs.ATG" 
 out type);
 				Expect(21);
 
-#line  2113 "cs.ATG" 
+#line  2118 "cs.ATG" 
 				expressions.Add(new CastExpression(type)); 
 			}
 		}
 		PrimaryExpr(
-#line  2117 "cs.ATG" 
+#line  2122 "cs.ATG" 
 out expr);
 
-#line  2117 "cs.ATG" 
+#line  2122 "cs.ATG" 
 		for (int i = 0; i < expressions.Count; ++i) {
 		Expression nextExpression = i + 1 < expressions.Count ? (Expression)expressions[i + 1] : expr;
 		if (expressions[i] is CastExpression) {
@@ -4534,33 +4526,33 @@ out expr);
 	}
 
 	void ConditionalOrExpr(
-#line  2288 "cs.ATG" 
+#line  2291 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2289 "cs.ATG" 
+#line  2292 "cs.ATG" 
 		Expression expr;   
 		ConditionalAndExpr(
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 26) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 out expr);
 			ConditionalAndExpr(
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 ref expr);
 
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr);  
 		}
 	}
 
 	void PrimaryExpr(
-#line  2134 "cs.ATG" 
+#line  2139 "cs.ATG" 
 out Expression pexpr) {
 
-#line  2136 "cs.ATG" 
+#line  2141 "cs.ATG" 
 		TypeReference type = null;
 		List<TypeReference> typeList = null;
 		bool isArrayCreation = false;
@@ -4570,332 +4562,332 @@ out Expression pexpr) {
 		if (la.kind == 112) {
 			lexer.NextToken();
 
-#line  2144 "cs.ATG" 
+#line  2149 "cs.ATG" 
 			pexpr = new PrimitiveExpression(true, "true");  
 		} else if (la.kind == 71) {
 			lexer.NextToken();
 
-#line  2145 "cs.ATG" 
+#line  2150 "cs.ATG" 
 			pexpr = new PrimitiveExpression(false, "false"); 
 		} else if (la.kind == 89) {
 			lexer.NextToken();
 
-#line  2146 "cs.ATG" 
+#line  2151 "cs.ATG" 
 			pexpr = new PrimitiveExpression(null, "null");  
 		} else if (la.kind == 2) {
 			lexer.NextToken();
 
-#line  2147 "cs.ATG" 
+#line  2152 "cs.ATG" 
 			pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 		} else if (
-#line  2148 "cs.ATG" 
+#line  2153 "cs.ATG" 
 la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) {
 			Expect(1);
 
-#line  2149 "cs.ATG" 
+#line  2154 "cs.ATG" 
 			type = new TypeReference(t.val); 
 			Expect(10);
 
-#line  2150 "cs.ATG" 
+#line  2155 "cs.ATG" 
 			pexpr = new TypeReferenceExpression(type); 
 			Expect(1);
 
-#line  2151 "cs.ATG" 
+#line  2156 "cs.ATG" 
 			if (type.Type == "global") { type.IsGlobal = true; type.Type = (t.val ?? "?"); } else type.Type += "." + (t.val ?? "?"); 
 		} else if (la.kind == 1) {
 			lexer.NextToken();
 
-#line  2153 "cs.ATG" 
+#line  2158 "cs.ATG" 
 			pexpr = new IdentifierExpression(t.val); 
 		} else if (la.kind == 20) {
 			lexer.NextToken();
 			Expr(
-#line  2155 "cs.ATG" 
+#line  2160 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  2155 "cs.ATG" 
+#line  2160 "cs.ATG" 
 			pexpr = new ParenthesizedExpression(expr); 
-		} else if (StartOf(26)) {
+		} else if (StartOf(27)) {
 
-#line  2157 "cs.ATG" 
+#line  2162 "cs.ATG" 
 			string val = null; 
 			switch (la.kind) {
 			case 51: {
 				lexer.NextToken();
 
-#line  2159 "cs.ATG" 
+#line  2164 "cs.ATG" 
 				val = "bool"; 
 				break;
 			}
 			case 53: {
 				lexer.NextToken();
 
-#line  2160 "cs.ATG" 
+#line  2165 "cs.ATG" 
 				val = "byte"; 
 				break;
 			}
 			case 56: {
 				lexer.NextToken();
 
-#line  2161 "cs.ATG" 
+#line  2166 "cs.ATG" 
 				val = "char"; 
 				break;
 			}
 			case 61: {
 				lexer.NextToken();
 
-#line  2162 "cs.ATG" 
+#line  2167 "cs.ATG" 
 				val = "decimal"; 
 				break;
 			}
 			case 65: {
 				lexer.NextToken();
 
-#line  2163 "cs.ATG" 
+#line  2168 "cs.ATG" 
 				val = "double"; 
 				break;
 			}
 			case 74: {
 				lexer.NextToken();
 
-#line  2164 "cs.ATG" 
+#line  2169 "cs.ATG" 
 				val = "float"; 
 				break;
 			}
 			case 81: {
 				lexer.NextToken();
 
-#line  2165 "cs.ATG" 
+#line  2170 "cs.ATG" 
 				val = "int"; 
 				break;
 			}
 			case 86: {
 				lexer.NextToken();
 
-#line  2166 "cs.ATG" 
+#line  2171 "cs.ATG" 
 				val = "long"; 
 				break;
 			}
 			case 90: {
 				lexer.NextToken();
 
-#line  2167 "cs.ATG" 
+#line  2172 "cs.ATG" 
 				val = "object"; 
 				break;
 			}
 			case 101: {
 				lexer.NextToken();
 
-#line  2168 "cs.ATG" 
+#line  2173 "cs.ATG" 
 				val = "sbyte"; 
 				break;
 			}
 			case 103: {
 				lexer.NextToken();
 
-#line  2169 "cs.ATG" 
+#line  2174 "cs.ATG" 
 				val = "short"; 
 				break;
 			}
 			case 107: {
 				lexer.NextToken();
 
-#line  2170 "cs.ATG" 
+#line  2175 "cs.ATG" 
 				val = "string"; 
 				break;
 			}
 			case 115: {
 				lexer.NextToken();
 
-#line  2171 "cs.ATG" 
+#line  2176 "cs.ATG" 
 				val = "uint"; 
 				break;
 			}
 			case 116: {
 				lexer.NextToken();
 
-#line  2172 "cs.ATG" 
+#line  2177 "cs.ATG" 
 				val = "ulong"; 
 				break;
 			}
 			case 119: {
 				lexer.NextToken();
 
-#line  2173 "cs.ATG" 
+#line  2178 "cs.ATG" 
 				val = "ushort"; 
 				break;
 			}
 			}
 
-#line  2174 "cs.ATG" 
+#line  2179 "cs.ATG" 
 			t.val = ""; 
 			Expect(15);
 			Expect(1);
 
-#line  2174 "cs.ATG" 
+#line  2179 "cs.ATG" 
 			pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); 
 		} else if (la.kind == 110) {
 			lexer.NextToken();
 
-#line  2176 "cs.ATG" 
+#line  2181 "cs.ATG" 
 			pexpr = new ThisReferenceExpression(); 
 		} else if (la.kind == 50) {
 			lexer.NextToken();
 
-#line  2178 "cs.ATG" 
+#line  2183 "cs.ATG" 
 			Expression retExpr = new BaseReferenceExpression(); 
 			if (la.kind == 15) {
 				lexer.NextToken();
 				Expect(1);
 
-#line  2180 "cs.ATG" 
+#line  2185 "cs.ATG" 
 				retExpr = new FieldReferenceExpression(retExpr, t.val); 
 			} else if (la.kind == 18) {
 				lexer.NextToken();
 				Expr(
-#line  2181 "cs.ATG" 
+#line  2186 "cs.ATG" 
 out expr);
 
-#line  2181 "cs.ATG" 
+#line  2186 "cs.ATG" 
 				List<Expression> indices = new List<Expression>(); if (expr != null) { indices.Add(expr); } 
 				while (la.kind == 14) {
 					lexer.NextToken();
 					Expr(
-#line  2182 "cs.ATG" 
+#line  2187 "cs.ATG" 
 out expr);
 
-#line  2182 "cs.ATG" 
+#line  2187 "cs.ATG" 
 					if (expr != null) { indices.Add(expr); } 
 				}
 				Expect(19);
 
-#line  2183 "cs.ATG" 
+#line  2188 "cs.ATG" 
 				retExpr = new IndexerExpression(retExpr, indices); 
 			} else SynErr(178);
 
-#line  2184 "cs.ATG" 
+#line  2189 "cs.ATG" 
 			pexpr = retExpr; 
 		} else if (la.kind == 88) {
 			lexer.NextToken();
 			NonArrayType(
-#line  2185 "cs.ATG" 
+#line  2190 "cs.ATG" 
 out type);
 
-#line  2186 "cs.ATG" 
+#line  2191 "cs.ATG" 
 			List<Expression> parameters = new List<Expression>(); 
 			if (la.kind == 20) {
 				lexer.NextToken();
 
-#line  2191 "cs.ATG" 
+#line  2196 "cs.ATG" 
 				ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); 
 				if (StartOf(21)) {
 					Argument(
-#line  2192 "cs.ATG" 
+#line  2197 "cs.ATG" 
 out expr);
 
-#line  2192 "cs.ATG" 
+#line  2197 "cs.ATG" 
 					if (expr != null) { parameters.Add(expr); } 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  2193 "cs.ATG" 
+#line  2198 "cs.ATG" 
 out expr);
 
-#line  2193 "cs.ATG" 
+#line  2198 "cs.ATG" 
 						if (expr != null) { parameters.Add(expr); } 
 					}
 				}
 				Expect(21);
 
-#line  2195 "cs.ATG" 
+#line  2200 "cs.ATG" 
 				pexpr = oce; 
 			} else if (la.kind == 18) {
 				lexer.NextToken();
 
-#line  2197 "cs.ATG" 
+#line  2202 "cs.ATG" 
 				isArrayCreation = true; ArrayCreateExpression ace = new ArrayCreateExpression(type); pexpr = ace; 
 
-#line  2198 "cs.ATG" 
+#line  2203 "cs.ATG" 
 				int dims = 0; List<int> ranks = new List<int>(); 
 				if (la.kind == 14 || la.kind == 19) {
 					while (la.kind == 14) {
 						lexer.NextToken();
 
-#line  2200 "cs.ATG" 
+#line  2205 "cs.ATG" 
 						dims += 1; 
 					}
 					Expect(19);
 
-#line  2201 "cs.ATG" 
+#line  2206 "cs.ATG" 
 					ranks.Add(dims); dims = 0; 
 					while (la.kind == 18) {
 						lexer.NextToken();
 						while (la.kind == 14) {
 							lexer.NextToken();
 
-#line  2202 "cs.ATG" 
+#line  2207 "cs.ATG" 
 							++dims; 
 						}
 						Expect(19);
 
-#line  2202 "cs.ATG" 
+#line  2207 "cs.ATG" 
 						ranks.Add(dims); dims = 0; 
 					}
 
-#line  2203 "cs.ATG" 
+#line  2208 "cs.ATG" 
 					ace.CreateType.RankSpecifier = ranks.ToArray(); 
 					ArrayInitializer(
-#line  2204 "cs.ATG" 
+#line  2209 "cs.ATG" 
 out expr);
 
-#line  2204 "cs.ATG" 
+#line  2209 "cs.ATG" 
 					ace.ArrayInitializer = (ArrayInitializerExpression)expr; 
 				} else if (StartOf(5)) {
 					Expr(
-#line  2205 "cs.ATG" 
+#line  2210 "cs.ATG" 
 out expr);
 
-#line  2205 "cs.ATG" 
+#line  2210 "cs.ATG" 
 					if (expr != null) parameters.Add(expr); 
 					while (la.kind == 14) {
 						lexer.NextToken();
 
-#line  2206 "cs.ATG" 
+#line  2211 "cs.ATG" 
 						dims += 1; 
 						Expr(
-#line  2207 "cs.ATG" 
+#line  2212 "cs.ATG" 
 out expr);
 
-#line  2207 "cs.ATG" 
+#line  2212 "cs.ATG" 
 						if (expr != null) parameters.Add(expr); 
 					}
 					Expect(19);
 
-#line  2209 "cs.ATG" 
+#line  2214 "cs.ATG" 
 					ranks.Add(dims); ace.Arguments = parameters; dims = 0; 
 					while (la.kind == 18) {
 						lexer.NextToken();
 						while (la.kind == 14) {
 							lexer.NextToken();
 
-#line  2210 "cs.ATG" 
+#line  2215 "cs.ATG" 
 							++dims; 
 						}
 						Expect(19);
 
-#line  2210 "cs.ATG" 
+#line  2215 "cs.ATG" 
 						ranks.Add(dims); dims = 0; 
 					}
 
-#line  2211 "cs.ATG" 
+#line  2216 "cs.ATG" 
 					ace.CreateType.RankSpecifier = ranks.ToArray(); 
 					if (la.kind == 16) {
 						ArrayInitializer(
-#line  2212 "cs.ATG" 
+#line  2217 "cs.ATG" 
 out expr);
 
-#line  2212 "cs.ATG" 
+#line  2217 "cs.ATG" 
 						ace.ArrayInitializer = (ArrayInitializerExpression)expr; 
 					}
 				} else SynErr(179);
@@ -4904,204 +4896,202 @@ out expr);
 			lexer.NextToken();
 			Expect(20);
 			if (
-#line  2217 "cs.ATG" 
+#line  2222 "cs.ATG" 
 NotVoidPointer()) {
 				Expect(122);
 
-#line  2217 "cs.ATG" 
+#line  2222 "cs.ATG" 
 				type = new TypeReference("void"); 
 			} else if (StartOf(9)) {
 				TypeWithRestriction(
-#line  2218 "cs.ATG" 
+#line  2223 "cs.ATG" 
 out type, true, true);
 			} else SynErr(181);
 			Expect(21);
 
-#line  2219 "cs.ATG" 
+#line  2224 "cs.ATG" 
 			pexpr = new TypeOfExpression(type); 
-		} else if (
-#line  2221 "cs.ATG" 
-la.kind == Tokens.Default && Peek(1).kind == Tokens.OpenParenthesis) {
-			Expect(62);
+		} else if (la.kind == 62) {
+			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  2223 "cs.ATG" 
+#line  2226 "cs.ATG" 
 out type);
 			Expect(21);
 
-#line  2223 "cs.ATG" 
+#line  2226 "cs.ATG" 
 			pexpr = new DefaultValueExpression(type); 
 		} else if (la.kind == 104) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  2224 "cs.ATG" 
+#line  2227 "cs.ATG" 
 out type);
 			Expect(21);
 
-#line  2224 "cs.ATG" 
+#line  2227 "cs.ATG" 
 			pexpr = new SizeOfExpression(type); 
 		} else if (la.kind == 57) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  2225 "cs.ATG" 
+#line  2228 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  2225 "cs.ATG" 
+#line  2228 "cs.ATG" 
 			pexpr = new CheckedExpression(expr); 
 		} else if (la.kind == 117) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  2226 "cs.ATG" 
+#line  2229 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  2226 "cs.ATG" 
+#line  2229 "cs.ATG" 
 			pexpr = new UncheckedExpression(expr); 
 		} else if (la.kind == 63) {
 			lexer.NextToken();
 			AnonymousMethodExpr(
-#line  2227 "cs.ATG" 
+#line  2230 "cs.ATG" 
 out expr);
 
-#line  2227 "cs.ATG" 
+#line  2230 "cs.ATG" 
 			pexpr = expr; 
 		} else SynErr(182);
-		while (StartOf(27) || 
-#line  2238 "cs.ATG" 
+		while (StartOf(28) || 
+#line  2241 "cs.ATG" 
 IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || 
-#line  2247 "cs.ATG" 
+#line  2250 "cs.ATG" 
 IsGenericFollowedBy(Tokens.OpenParenthesis)) {
 			if (la.kind == 31 || la.kind == 32) {
 				if (la.kind == 31) {
 					lexer.NextToken();
 
-#line  2231 "cs.ATG" 
+#line  2234 "cs.ATG" 
 					pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); 
 				} else if (la.kind == 32) {
 					lexer.NextToken();
 
-#line  2232 "cs.ATG" 
+#line  2235 "cs.ATG" 
 					pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); 
 				} else SynErr(183);
 			} else if (la.kind == 47) {
 				lexer.NextToken();
 				Expect(1);
 
-#line  2235 "cs.ATG" 
+#line  2238 "cs.ATG" 
 				pexpr = new PointerReferenceExpression(pexpr, t.val); 
 			} else if (la.kind == 15) {
 				lexer.NextToken();
 				Expect(1);
 
-#line  2236 "cs.ATG" 
+#line  2239 "cs.ATG" 
 				pexpr = new FieldReferenceExpression(pexpr, t.val);
 			} else if (
-#line  2238 "cs.ATG" 
+#line  2241 "cs.ATG" 
 IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) {
 				TypeArgumentList(
-#line  2239 "cs.ATG" 
+#line  2242 "cs.ATG" 
 out typeList, false);
 				Expect(15);
 				Expect(1);
 
-#line  2241 "cs.ATG" 
+#line  2244 "cs.ATG" 
 				pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val);
 			} else if (la.kind == 20) {
 				lexer.NextToken();
 
-#line  2243 "cs.ATG" 
+#line  2246 "cs.ATG" 
 				List<Expression> parameters = new List<Expression>(); 
 				if (StartOf(21)) {
 					Argument(
-#line  2244 "cs.ATG" 
+#line  2247 "cs.ATG" 
 out expr);
 
-#line  2244 "cs.ATG" 
+#line  2247 "cs.ATG" 
 					if (expr != null) {parameters.Add(expr);} 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  2245 "cs.ATG" 
+#line  2248 "cs.ATG" 
 out expr);
 
-#line  2245 "cs.ATG" 
+#line  2248 "cs.ATG" 
 						if (expr != null) {parameters.Add(expr);} 
 					}
 				}
 				Expect(21);
 
-#line  2246 "cs.ATG" 
+#line  2249 "cs.ATG" 
 				pexpr = new InvocationExpression(pexpr, parameters); 
 			} else if (
-#line  2247 "cs.ATG" 
+#line  2250 "cs.ATG" 
 IsGenericFollowedBy(Tokens.OpenParenthesis)) {
 				TypeArgumentList(
-#line  2247 "cs.ATG" 
+#line  2250 "cs.ATG" 
 out typeList, false);
 				Expect(20);
 
-#line  2248 "cs.ATG" 
+#line  2251 "cs.ATG" 
 				List<Expression> parameters = new List<Expression>(); 
 				if (StartOf(21)) {
 					Argument(
-#line  2249 "cs.ATG" 
+#line  2252 "cs.ATG" 
 out expr);
 
-#line  2249 "cs.ATG" 
+#line  2252 "cs.ATG" 
 					if (expr != null) {parameters.Add(expr);} 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  2250 "cs.ATG" 
+#line  2253 "cs.ATG" 
 out expr);
 
-#line  2250 "cs.ATG" 
+#line  2253 "cs.ATG" 
 						if (expr != null) {parameters.Add(expr);} 
 					}
 				}
 				Expect(21);
 
-#line  2251 "cs.ATG" 
+#line  2254 "cs.ATG" 
 				pexpr = new InvocationExpression(pexpr, parameters, typeList); 
 			} else {
 
-#line  2253 "cs.ATG" 
+#line  2256 "cs.ATG" 
 				if (isArrayCreation) Error("element access not allow on array creation");
 				List<Expression> indices = new List<Expression>();
 				
 				lexer.NextToken();
 				Expr(
-#line  2256 "cs.ATG" 
+#line  2259 "cs.ATG" 
 out expr);
 
-#line  2256 "cs.ATG" 
+#line  2259 "cs.ATG" 
 				if (expr != null) { indices.Add(expr); } 
 				while (la.kind == 14) {
 					lexer.NextToken();
 					Expr(
-#line  2257 "cs.ATG" 
+#line  2260 "cs.ATG" 
 out expr);
 
-#line  2257 "cs.ATG" 
+#line  2260 "cs.ATG" 
 					if (expr != null) { indices.Add(expr); } 
 				}
 				Expect(19);
 
-#line  2258 "cs.ATG" 
+#line  2261 "cs.ATG" 
 				pexpr = new IndexerExpression(pexpr, indices); 
 			}
 		}
 	}
 
 	void AnonymousMethodExpr(
-#line  2262 "cs.ATG" 
+#line  2265 "cs.ATG" 
 out Expression outExpr) {
 
-#line  2264 "cs.ATG" 
+#line  2267 "cs.ATG" 
 		AnonymousMethodExpression expr = new AnonymousMethodExpression();
 		expr.StartLocation = t.Location;
 		Statement stmt;
@@ -5112,74 +5102,74 @@ out Expression outExpr) {
 			lexer.NextToken();
 			if (StartOf(10)) {
 				FormalParameterList(
-#line  2273 "cs.ATG" 
+#line  2276 "cs.ATG" 
 p);
 
-#line  2273 "cs.ATG" 
+#line  2276 "cs.ATG" 
 				expr.Parameters = p; 
 			}
 			Expect(21);
 		}
 
-#line  2278 "cs.ATG" 
+#line  2281 "cs.ATG" 
 		if (compilationUnit != null) { 
 		Block(
-#line  2279 "cs.ATG" 
+#line  2282 "cs.ATG" 
 out stmt);
 
-#line  2279 "cs.ATG" 
+#line  2282 "cs.ATG" 
 		expr.Body  = (BlockStatement)stmt; 
 
-#line  2280 "cs.ATG" 
+#line  2283 "cs.ATG" 
 		} else { 
 		Expect(16);
 
-#line  2282 "cs.ATG" 
+#line  2285 "cs.ATG" 
 		lexer.SkipCurrentBlock(); 
 		Expect(17);
 
-#line  2284 "cs.ATG" 
+#line  2287 "cs.ATG" 
 		} 
 
-#line  2285 "cs.ATG" 
+#line  2288 "cs.ATG" 
 		expr.EndLocation = t.Location; 
 	}
 
 	void TypeArgumentList(
-#line  2458 "cs.ATG" 
+#line  2461 "cs.ATG" 
 out List<TypeReference> types, bool canBeUnbound) {
 
-#line  2460 "cs.ATG" 
+#line  2463 "cs.ATG" 
 		types = new List<TypeReference>();
 		TypeReference type = null;
 		
 		Expect(23);
 		if (
-#line  2465 "cs.ATG" 
+#line  2468 "cs.ATG" 
 canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) {
 
-#line  2466 "cs.ATG" 
+#line  2469 "cs.ATG" 
 			types.Add(TypeReference.Null); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 
-#line  2467 "cs.ATG" 
+#line  2470 "cs.ATG" 
 				types.Add(TypeReference.Null); 
 			}
 		} else if (StartOf(9)) {
 			Type(
-#line  2468 "cs.ATG" 
+#line  2471 "cs.ATG" 
 out type);
 
-#line  2468 "cs.ATG" 
+#line  2471 "cs.ATG" 
 			types.Add(type); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Type(
-#line  2469 "cs.ATG" 
+#line  2472 "cs.ATG" 
 out type);
 
-#line  2469 "cs.ATG" 
+#line  2472 "cs.ATG" 
 				types.Add(type); 
 			}
 		} else SynErr(184);
@@ -5187,206 +5177,206 @@ out type);
 	}
 
 	void ConditionalAndExpr(
-#line  2294 "cs.ATG" 
+#line  2297 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2295 "cs.ATG" 
+#line  2298 "cs.ATG" 
 		Expression expr; 
 		InclusiveOrExpr(
-#line  2297 "cs.ATG" 
+#line  2300 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 25) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2297 "cs.ATG" 
+#line  2300 "cs.ATG" 
 out expr);
 			InclusiveOrExpr(
-#line  2297 "cs.ATG" 
+#line  2300 "cs.ATG" 
 ref expr);
 
-#line  2297 "cs.ATG" 
+#line  2300 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr);  
 		}
 	}
 
 	void InclusiveOrExpr(
-#line  2300 "cs.ATG" 
+#line  2303 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2301 "cs.ATG" 
+#line  2304 "cs.ATG" 
 		Expression expr; 
 		ExclusiveOrExpr(
-#line  2303 "cs.ATG" 
+#line  2306 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 29) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2303 "cs.ATG" 
+#line  2306 "cs.ATG" 
 out expr);
 			ExclusiveOrExpr(
-#line  2303 "cs.ATG" 
+#line  2306 "cs.ATG" 
 ref expr);
 
-#line  2303 "cs.ATG" 
+#line  2306 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr);  
 		}
 	}
 
 	void ExclusiveOrExpr(
-#line  2306 "cs.ATG" 
+#line  2309 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2307 "cs.ATG" 
+#line  2310 "cs.ATG" 
 		Expression expr; 
 		AndExpr(
-#line  2309 "cs.ATG" 
+#line  2312 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 30) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2309 "cs.ATG" 
+#line  2312 "cs.ATG" 
 out expr);
 			AndExpr(
-#line  2309 "cs.ATG" 
+#line  2312 "cs.ATG" 
 ref expr);
 
-#line  2309 "cs.ATG" 
+#line  2312 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr);  
 		}
 	}
 
 	void AndExpr(
-#line  2312 "cs.ATG" 
+#line  2315 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2313 "cs.ATG" 
+#line  2316 "cs.ATG" 
 		Expression expr; 
 		EqualityExpr(
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 28) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 out expr);
 			EqualityExpr(
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 ref expr);
 
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr);  
 		}
 	}
 
 	void EqualityExpr(
-#line  2318 "cs.ATG" 
+#line  2321 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2320 "cs.ATG" 
+#line  2323 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		RelationalExpr(
-#line  2324 "cs.ATG" 
+#line  2327 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 33 || la.kind == 34) {
 			if (la.kind == 34) {
 				lexer.NextToken();
 
-#line  2327 "cs.ATG" 
+#line  2330 "cs.ATG" 
 				op = BinaryOperatorType.InEquality; 
 			} else {
 				lexer.NextToken();
 
-#line  2328 "cs.ATG" 
+#line  2331 "cs.ATG" 
 				op = BinaryOperatorType.Equality; 
 			}
 			UnaryExpr(
-#line  2330 "cs.ATG" 
+#line  2333 "cs.ATG" 
 out expr);
 			RelationalExpr(
-#line  2330 "cs.ATG" 
+#line  2333 "cs.ATG" 
 ref expr);
 
-#line  2330 "cs.ATG" 
+#line  2333 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void RelationalExpr(
-#line  2334 "cs.ATG" 
+#line  2337 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2336 "cs.ATG" 
+#line  2339 "cs.ATG" 
 		TypeReference type;
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ShiftExpr(
-#line  2341 "cs.ATG" 
+#line  2344 "cs.ATG" 
 ref outExpr);
-		while (StartOf(28)) {
-			if (StartOf(29)) {
+		while (StartOf(29)) {
+			if (StartOf(30)) {
 				if (la.kind == 23) {
 					lexer.NextToken();
 
-#line  2343 "cs.ATG" 
+#line  2346 "cs.ATG" 
 					op = BinaryOperatorType.LessThan; 
 				} else if (la.kind == 22) {
 					lexer.NextToken();
 
-#line  2344 "cs.ATG" 
+#line  2347 "cs.ATG" 
 					op = BinaryOperatorType.GreaterThan; 
 				} else if (la.kind == 36) {
 					lexer.NextToken();
 
-#line  2345 "cs.ATG" 
+#line  2348 "cs.ATG" 
 					op = BinaryOperatorType.LessThanOrEqual; 
 				} else if (la.kind == 35) {
 					lexer.NextToken();
 
-#line  2346 "cs.ATG" 
+#line  2349 "cs.ATG" 
 					op = BinaryOperatorType.GreaterThanOrEqual; 
 				} else SynErr(185);
 				UnaryExpr(
-#line  2348 "cs.ATG" 
+#line  2351 "cs.ATG" 
 out expr);
 				ShiftExpr(
-#line  2349 "cs.ATG" 
+#line  2352 "cs.ATG" 
 ref expr);
 
-#line  2350 "cs.ATG" 
+#line  2353 "cs.ATG" 
 				outExpr = new BinaryOperatorExpression(outExpr, op, expr); 
 			} else {
 				if (la.kind == 84) {
 					lexer.NextToken();
 					TypeWithRestriction(
-#line  2353 "cs.ATG" 
+#line  2356 "cs.ATG" 
 out type, false, false);
 					if (
-#line  2354 "cs.ATG" 
+#line  2357 "cs.ATG" 
 la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) {
 						NullableQuestionMark(
-#line  2355 "cs.ATG" 
+#line  2358 "cs.ATG" 
 ref type);
 					}
 
-#line  2356 "cs.ATG" 
+#line  2359 "cs.ATG" 
 					outExpr = new TypeOfIsExpression(outExpr, type); 
 				} else if (la.kind == 49) {
 					lexer.NextToken();
 					TypeWithRestriction(
-#line  2358 "cs.ATG" 
+#line  2361 "cs.ATG" 
 out type, false, false);
 					if (
-#line  2359 "cs.ATG" 
+#line  2362 "cs.ATG" 
 la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) {
 						NullableQuestionMark(
-#line  2360 "cs.ATG" 
+#line  2363 "cs.ATG" 
 ref type);
 					}
 
-#line  2361 "cs.ATG" 
+#line  2364 "cs.ATG" 
 					outExpr = new CastExpression(type, outExpr, CastType.TryCast); 
 				} else SynErr(186);
 			}
@@ -5394,83 +5384,83 @@ ref type);
 	}
 
 	void ShiftExpr(
-#line  2366 "cs.ATG" 
+#line  2369 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2368 "cs.ATG" 
+#line  2371 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		AdditiveExpr(
-#line  2372 "cs.ATG" 
+#line  2375 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 37 || 
-#line  2375 "cs.ATG" 
+#line  2378 "cs.ATG" 
 IsShiftRight()) {
 			if (la.kind == 37) {
 				lexer.NextToken();
 
-#line  2374 "cs.ATG" 
+#line  2377 "cs.ATG" 
 				op = BinaryOperatorType.ShiftLeft; 
 			} else {
 				Expect(22);
 				Expect(22);
 
-#line  2376 "cs.ATG" 
+#line  2379 "cs.ATG" 
 				op = BinaryOperatorType.ShiftRight; 
 			}
 			UnaryExpr(
-#line  2379 "cs.ATG" 
+#line  2382 "cs.ATG" 
 out expr);
 			AdditiveExpr(
-#line  2379 "cs.ATG" 
+#line  2382 "cs.ATG" 
 ref expr);
 
-#line  2379 "cs.ATG" 
+#line  2382 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void AdditiveExpr(
-#line  2383 "cs.ATG" 
+#line  2386 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2385 "cs.ATG" 
+#line  2388 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		MultiplicativeExpr(
-#line  2389 "cs.ATG" 
+#line  2392 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 4 || la.kind == 5) {
 			if (la.kind == 4) {
 				lexer.NextToken();
 
-#line  2392 "cs.ATG" 
+#line  2395 "cs.ATG" 
 				op = BinaryOperatorType.Add; 
 			} else {
 				lexer.NextToken();
 
-#line  2393 "cs.ATG" 
+#line  2396 "cs.ATG" 
 				op = BinaryOperatorType.Subtract; 
 			}
 			UnaryExpr(
-#line  2395 "cs.ATG" 
+#line  2398 "cs.ATG" 
 out expr);
 			MultiplicativeExpr(
-#line  2395 "cs.ATG" 
+#line  2398 "cs.ATG" 
 ref expr);
 
-#line  2395 "cs.ATG" 
+#line  2398 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void MultiplicativeExpr(
-#line  2399 "cs.ATG" 
+#line  2402 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2401 "cs.ATG" 
+#line  2404 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
@@ -5478,57 +5468,57 @@ ref Expression outExpr) {
 			if (la.kind == 6) {
 				lexer.NextToken();
 
-#line  2407 "cs.ATG" 
+#line  2410 "cs.ATG" 
 				op = BinaryOperatorType.Multiply; 
 			} else if (la.kind == 7) {
 				lexer.NextToken();
 
-#line  2408 "cs.ATG" 
+#line  2411 "cs.ATG" 
 				op = BinaryOperatorType.Divide; 
 			} else {
 				lexer.NextToken();
 
-#line  2409 "cs.ATG" 
+#line  2412 "cs.ATG" 
 				op = BinaryOperatorType.Modulus; 
 			}
 			UnaryExpr(
-#line  2411 "cs.ATG" 
+#line  2414 "cs.ATG" 
 out expr);
 
-#line  2411 "cs.ATG" 
+#line  2414 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr); 
 		}
 	}
 
 	void TypeParameterConstraintsClauseBase(
-#line  2515 "cs.ATG" 
+#line  2518 "cs.ATG" 
 out TypeReference type) {
 
-#line  2516 "cs.ATG" 
+#line  2519 "cs.ATG" 
 		TypeReference t; type = null; 
 		if (la.kind == 108) {
 			lexer.NextToken();
 
-#line  2518 "cs.ATG" 
+#line  2521 "cs.ATG" 
 			type = new TypeReference("struct"); 
 		} else if (la.kind == 58) {
 			lexer.NextToken();
 
-#line  2519 "cs.ATG" 
+#line  2522 "cs.ATG" 
 			type = new TypeReference("struct"); 
 		} else if (la.kind == 88) {
 			lexer.NextToken();
 			Expect(20);
 			Expect(21);
 
-#line  2520 "cs.ATG" 
+#line  2523 "cs.ATG" 
 			type = new TypeReference("struct"); 
 		} else if (StartOf(9)) {
 			Type(
-#line  2521 "cs.ATG" 
+#line  2524 "cs.ATG" 
 out t);
 
-#line  2521 "cs.ATG" 
+#line  2524 "cs.ATG" 
 			type = t; 
 		} else SynErr(187);
 	}
@@ -5787,7 +5777,7 @@ out t);
 	{x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, T,x,x,x, x,x,x,T, T,T,x,x, x,x,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x},
 	{x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,x,x,T, T,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x},
-	{x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,x,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x},
+	{x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,T,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x},
 	{x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, T,T,T,T, T,T,x,T, T,T,T,x, x,T,x,T, x,T,T,T, x,T,T,x, T,T,T,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
@@ -5802,11 +5792,12 @@ out t);
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x},
-	{x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,T, T,T,x,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x},
-	{x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,x,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, T,x,x,x, x,x,x,T, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x},
+	{x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,T, T,T,T,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x},
+	{x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,T,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, T,x,x,x, x,x,x,T, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x},
 	{x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,x, T,T,x,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x},
+	{x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,x, T,T,T,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x},
 	{x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,T,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x},
+	{x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, T,T,x,T, T,T,T,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x},
 	{x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
index d085adfdc4..2fccc15821 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
+++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
@@ -1715,8 +1715,6 @@ VariableInitializer<out Expression initializerExpression>
 	Expr<out initializerExpression>
 	| ArrayInitializer<out initializerExpression>
 	| "stackalloc" Type<out type> "[" Expr<out expr> "]" (. initializerExpression = new StackAllocExpression(type, expr); .)
-	| /* workaround for coco bug? doesn't work in Expr production in this case. */
-	  "default" "(" Type<out type> ")" (. initializerExpression = new DefaultValueExpression(type); .)
 .
 
 OverloadableOperator<out OverloadableOperatorType op>
@@ -1890,7 +1888,7 @@ EmbeddedStatement<out Statement statement>
 	} .)
   | "switch" (. List<SwitchSection> switchSections = new List<SwitchSection>(); SwitchSection switchSection; .)
 	  "(" Expr<out expr> ")"
-	  "{" { SwitchSection<out switchSection> (. switchSections.Add(switchSection); .) } 
+	  "{" SwitchSections<switchSections>
 	  "}"  (. statement = new SwitchStatement(expr, switchSections); .)
 	/*--- iteration statements (while, do, for, foreach): */
   | "while" "(" Expr<out expr> ")"
@@ -1964,22 +1962,29 @@ ForIterator<out List<Statement> iterator>
 	StatementExpr<out stmt> (. iterator.Add(stmt);.) { "," StatementExpr<out stmt> (. iterator.Add(stmt); .) }
 .
 
-SwitchSection<out SwitchSection stmt>
+SwitchSections<List<SwitchSection> switchSections>
 (.
 	SwitchSection switchSection = new SwitchSection();
 	CaseLabel label;
 .)
 =
 	SwitchLabel<out label> (. if (label != null) { switchSection.SwitchLabels.Add(label); } .) 
+	(. compilationUnit.BlockStart(switchSection); .)
 	{
-		SwitchLabel<out label> (. if (label != null) { switchSection.SwitchLabels.Add(label); } .) 
+		( SwitchLabel<out label>
+		  (. if (label != null) {
+		  		if (switchSection.Children.Count > 0) {
+		  			// open new section
+		  			compilationUnit.BlockEnd(); switchSections.Add(switchSection);
+		  			switchSection = new SwitchSection();
+		  			compilationUnit.BlockStart(switchSection);
+		  		}
+		  		switchSection.SwitchLabels.Add(label);
+		  	 }
+		  .)
+		| Statement)
 	}
-	(. compilationUnit.BlockStart(switchSection); .)
-	Statement { Statement }
-	(.
-		compilationUnit.BlockEnd();
-		stmt = switchSection;
-	.)
+	(. compilationUnit.BlockEnd(); switchSections.Add(switchSection); .)
 .
 
 SwitchLabel<out CaseLabel label>
@@ -2218,9 +2223,7 @@ PrimaryExpr<out Expression pexpr>
 			| TypeWithRestriction<out type, true, true>
 		) ")"                            (. pexpr = new TypeOfExpression(type); .)
 		
-		| IF (la.kind == Tokens.Default && Peek(1).kind == Tokens.OpenParenthesis)
-			/* possible conflict with switch's default */
-			"default" "(" Type<out type> ")" (. pexpr = new DefaultValueExpression(type); .)
+		| "default" "(" Type<out type> ")" (. pexpr = new DefaultValueExpression(type); .)
 		| "sizeof" "(" Type<out type> ")" (. pexpr = new SizeOfExpression(type); .)
 		| "checked" "(" Expr<out expr> ")" (. pexpr = new CheckedExpression(expr); .)
 		| "unchecked" "(" Expr<out expr> ")" (. pexpr = new UncheckedExpression(expr); .)
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
index 0afbcf0a38..5e3c045063 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
@@ -37,12 +37,14 @@ public string ContainingAssembly
 }
 Token t
 {
+	[System.Diagnostics.DebuggerStepThrough]
 	get {
 		return lexer.Token;
 	}
 }
 Token la
 {
+	[System.Diagnostics.DebuggerStepThrough]
 	get {
 		return lexer.LookAhead;
 	}
@@ -285,7 +287,7 @@ bool IsLocalAttrTarget() {
 
 	void VBNET() {
 
-#line  480 "VBNET.ATG" 
+#line  482 "VBNET.ATG" 
 		lexer.NextToken(); // get the first token
 		compilationUnit = new CompilationUnit();
 		withStatements = new Stack();
@@ -300,7 +302,7 @@ bool IsLocalAttrTarget() {
 			ImportsStmt();
 		}
 		while (
-#line  487 "VBNET.ATG" 
+#line  489 "VBNET.ATG" 
 IsGlobalAttrTarget()) {
 			GlobalAttributeSection();
 		}
@@ -312,49 +314,49 @@ IsGlobalAttrTarget()) {
 
 	void OptionStmt() {
 
-#line  492 "VBNET.ATG" 
+#line  494 "VBNET.ATG" 
 		INode node = null; bool val = true; 
 		Expect(136);
 
-#line  493 "VBNET.ATG" 
+#line  495 "VBNET.ATG" 
 		Point startPos = t.Location; 
 		if (la.kind == 95) {
 			lexer.NextToken();
 			if (la.kind == 134 || la.kind == 135) {
 				OptionValue(
-#line  495 "VBNET.ATG" 
+#line  497 "VBNET.ATG" 
 ref val);
 			}
 
-#line  496 "VBNET.ATG" 
+#line  498 "VBNET.ATG" 
 			node = new OptionDeclaration(OptionType.Explicit, val); 
 		} else if (la.kind == 164) {
 			lexer.NextToken();
 			if (la.kind == 134 || la.kind == 135) {
 				OptionValue(
-#line  498 "VBNET.ATG" 
+#line  500 "VBNET.ATG" 
 ref val);
 			}
 
-#line  499 "VBNET.ATG" 
+#line  501 "VBNET.ATG" 
 			node = new OptionDeclaration(OptionType.Strict, val); 
 		} else if (la.kind == 70) {
 			lexer.NextToken();
 			if (la.kind == 51) {
 				lexer.NextToken();
 
-#line  501 "VBNET.ATG" 
+#line  503 "VBNET.ATG" 
 				node = new OptionDeclaration(OptionType.CompareBinary, val); 
 			} else if (la.kind == 169) {
 				lexer.NextToken();
 
-#line  502 "VBNET.ATG" 
+#line  504 "VBNET.ATG" 
 				node = new OptionDeclaration(OptionType.CompareText, val); 
 			} else SynErr(206);
 		} else SynErr(207);
 		EndOfStmt();
 
-#line  507 "VBNET.ATG" 
+#line  509 "VBNET.ATG" 
 		if (node != null) {
 		node.StartLocation = startPos;
 		node.EndLocation   = t.Location;
@@ -365,33 +367,33 @@ ref val);
 
 	void ImportsStmt() {
 
-#line  530 "VBNET.ATG" 
+#line  532 "VBNET.ATG" 
 		List<Using> usings = new List<Using>();
 		
 		Expect(108);
 
-#line  534 "VBNET.ATG" 
+#line  536 "VBNET.ATG" 
 		Point startPos = t.Location;
 		Using u;
 		
 		ImportClause(
-#line  537 "VBNET.ATG" 
+#line  539 "VBNET.ATG" 
 out u);
 
-#line  537 "VBNET.ATG" 
+#line  539 "VBNET.ATG" 
 		if (u != null) { usings.Add(u); } 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			ImportClause(
-#line  539 "VBNET.ATG" 
+#line  541 "VBNET.ATG" 
 out u);
 
-#line  539 "VBNET.ATG" 
+#line  541 "VBNET.ATG" 
 			if (u != null) { usings.Add(u); } 
 		}
 		EndOfStmt();
 
-#line  543 "VBNET.ATG" 
+#line  545 "VBNET.ATG" 
 		UsingDeclaration usingDeclaration = new UsingDeclaration(usings);
 		usingDeclaration.StartLocation = startPos;
 		usingDeclaration.EndLocation   = t.Location;
@@ -401,7 +403,7 @@ out u);
 
 	void GlobalAttributeSection() {
 
-#line  2184 "VBNET.ATG" 
+#line  2194 "VBNET.ATG" 
 		Point startPos = t.Location; 
 		Expect(27);
 		if (la.kind == 49) {
@@ -410,20 +412,20 @@ out u);
 			lexer.NextToken();
 		} else SynErr(208);
 
-#line  2186 "VBNET.ATG" 
+#line  2196 "VBNET.ATG" 
 		string attributeTarget = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture);
 		List<ASTAttribute> attributes = new List<ASTAttribute>();
 		ASTAttribute attribute;
 		
 		Expect(13);
 		Attribute(
-#line  2190 "VBNET.ATG" 
+#line  2200 "VBNET.ATG" 
 out attribute);
 
-#line  2190 "VBNET.ATG" 
+#line  2200 "VBNET.ATG" 
 		attributes.Add(attribute); 
 		while (
-#line  2191 "VBNET.ATG" 
+#line  2201 "VBNET.ATG" 
 NotFinalComma()) {
 			if (la.kind == 12) {
 				lexer.NextToken();
@@ -435,10 +437,10 @@ NotFinalComma()) {
 				Expect(13);
 			}
 			Attribute(
-#line  2191 "VBNET.ATG" 
+#line  2201 "VBNET.ATG" 
 out attribute);
 
-#line  2191 "VBNET.ATG" 
+#line  2201 "VBNET.ATG" 
 			attributes.Add(attribute); 
 		}
 		if (la.kind == 12) {
@@ -447,7 +449,7 @@ out attribute);
 		Expect(26);
 		EndOfStmt();
 
-#line  2196 "VBNET.ATG" 
+#line  2206 "VBNET.ATG" 
 		AttributeSection section = new AttributeSection(attributeTarget, attributes);
 		section.StartLocation = startPos;
 		section.EndLocation = t.EndLocation;
@@ -457,7 +459,7 @@ out attribute);
 
 	void NamespaceMemberDecl() {
 
-#line  572 "VBNET.ATG" 
+#line  574 "VBNET.ATG" 
 		Modifiers m = new Modifiers();
 		AttributeSection section;
 		List<AttributeSection> attributes = new List<AttributeSection>();
@@ -466,14 +468,14 @@ out attribute);
 		if (la.kind == 126) {
 			lexer.NextToken();
 
-#line  579 "VBNET.ATG" 
+#line  581 "VBNET.ATG" 
 			Point startPos = t.Location;
 			
 			Qualident(
-#line  581 "VBNET.ATG" 
+#line  583 "VBNET.ATG" 
 out qualident);
 
-#line  583 "VBNET.ATG" 
+#line  585 "VBNET.ATG" 
 			INode node =  new NamespaceDeclaration(qualident);
 			node.StartLocation = startPos;
 			compilationUnit.AddChild(node);
@@ -482,42 +484,42 @@ out qualident);
 			Expect(1);
 			NamespaceBody();
 
-#line  591 "VBNET.ATG" 
+#line  593 "VBNET.ATG" 
 			node.EndLocation = t.Location;
 			compilationUnit.BlockEnd();
 			
 		} else if (StartOf(2)) {
 			while (la.kind == 27) {
 				AttributeSection(
-#line  595 "VBNET.ATG" 
+#line  597 "VBNET.ATG" 
 out section);
 
-#line  595 "VBNET.ATG" 
+#line  597 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			while (StartOf(3)) {
 				TypeModifier(
-#line  596 "VBNET.ATG" 
+#line  598 "VBNET.ATG" 
 m);
 			}
 			NonModuleDeclaration(
-#line  596 "VBNET.ATG" 
+#line  598 "VBNET.ATG" 
 m, attributes);
 		} else SynErr(210);
 	}
 
 	void OptionValue(
-#line  515 "VBNET.ATG" 
+#line  517 "VBNET.ATG" 
 ref bool val) {
 		if (la.kind == 135) {
 			lexer.NextToken();
 
-#line  517 "VBNET.ATG" 
+#line  519 "VBNET.ATG" 
 			val = true; 
 		} else if (la.kind == 134) {
 			lexer.NextToken();
 
-#line  519 "VBNET.ATG" 
+#line  521 "VBNET.ATG" 
 			val = false; 
 		} else SynErr(211);
 	}
@@ -534,25 +536,25 @@ ref bool val) {
 	}
 
 	void ImportClause(
-#line  550 "VBNET.ATG" 
+#line  552 "VBNET.ATG" 
 out Using u) {
 
-#line  552 "VBNET.ATG" 
+#line  554 "VBNET.ATG" 
 		string qualident  = null;
 		TypeReference aliasedType = null;
 		u = null;
 		
 		Qualident(
-#line  556 "VBNET.ATG" 
+#line  558 "VBNET.ATG" 
 out qualident);
 		if (la.kind == 11) {
 			lexer.NextToken();
 			TypeName(
-#line  557 "VBNET.ATG" 
+#line  559 "VBNET.ATG" 
 out aliasedType);
 		}
 
-#line  559 "VBNET.ATG" 
+#line  561 "VBNET.ATG" 
 		if (qualident != null && qualident.Length > 0) {
 		if (aliasedType != null) {
 			u = new Using(qualident, aliasedType);
@@ -564,47 +566,47 @@ out aliasedType);
 	}
 
 	void Qualident(
-#line  2912 "VBNET.ATG" 
+#line  2906 "VBNET.ATG" 
 out string qualident) {
 
-#line  2914 "VBNET.ATG" 
+#line  2908 "VBNET.ATG" 
 		string name;
 		qualidentBuilder.Length = 0; 
 		
 		Identifier();
 
-#line  2918 "VBNET.ATG" 
+#line  2912 "VBNET.ATG" 
 		qualidentBuilder.Append(t.val); 
 		while (
-#line  2919 "VBNET.ATG" 
+#line  2913 "VBNET.ATG" 
 DotAndIdentOrKw()) {
 			Expect(10);
 			IdentifierOrKeyword(
-#line  2919 "VBNET.ATG" 
+#line  2913 "VBNET.ATG" 
 out name);
 
-#line  2919 "VBNET.ATG" 
+#line  2913 "VBNET.ATG" 
 			qualidentBuilder.Append('.'); qualidentBuilder.Append(name); 
 		}
 
-#line  2921 "VBNET.ATG" 
+#line  2915 "VBNET.ATG" 
 		qualident = qualidentBuilder.ToString(); 
 	}
 
 	void TypeName(
-#line  2077 "VBNET.ATG" 
+#line  2087 "VBNET.ATG" 
 out TypeReference typeref) {
 
-#line  2078 "VBNET.ATG" 
+#line  2088 "VBNET.ATG" 
 		ArrayList rank = null; 
 		NonArrayTypeName(
-#line  2080 "VBNET.ATG" 
+#line  2090 "VBNET.ATG" 
 out typeref, false);
 		ArrayTypeModifiers(
-#line  2081 "VBNET.ATG" 
+#line  2091 "VBNET.ATG" 
 out rank);
 
-#line  2082 "VBNET.ATG" 
+#line  2092 "VBNET.ATG" 
 		if (rank != null && typeref != null) {
 		typeref.RankSpecifier = (int[])rank.ToArray(typeof(int));
 		}
@@ -621,35 +623,35 @@ out rank);
 	}
 
 	void AttributeSection(
-#line  2253 "VBNET.ATG" 
+#line  2263 "VBNET.ATG" 
 out AttributeSection section) {
 
-#line  2255 "VBNET.ATG" 
+#line  2265 "VBNET.ATG" 
 		string attributeTarget = "";List<ASTAttribute> attributes = new List<ASTAttribute>();
 		ASTAttribute attribute;
 		
 		
 		Expect(27);
 
-#line  2259 "VBNET.ATG" 
+#line  2269 "VBNET.ATG" 
 		Point startPos = t.Location; 
 		if (
-#line  2260 "VBNET.ATG" 
+#line  2270 "VBNET.ATG" 
 IsLocalAttrTarget()) {
 			if (la.kind == 93) {
 				lexer.NextToken();
 
-#line  2261 "VBNET.ATG" 
+#line  2271 "VBNET.ATG" 
 				attributeTarget = "event";
 			} else if (la.kind == 154) {
 				lexer.NextToken();
 
-#line  2262 "VBNET.ATG" 
+#line  2272 "VBNET.ATG" 
 				attributeTarget = "return";
 			} else {
 				Identifier();
 
-#line  2265 "VBNET.ATG" 
+#line  2275 "VBNET.ATG" 
 				string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture);
 				if (val != "field"	|| val != "method" ||
 					val != "module" || val != "param"  ||
@@ -662,20 +664,20 @@ IsLocalAttrTarget()) {
 			Expect(13);
 		}
 		Attribute(
-#line  2275 "VBNET.ATG" 
+#line  2285 "VBNET.ATG" 
 out attribute);
 
-#line  2275 "VBNET.ATG" 
+#line  2285 "VBNET.ATG" 
 		attributes.Add(attribute); 
 		while (
-#line  2276 "VBNET.ATG" 
+#line  2286 "VBNET.ATG" 
 NotFinalComma()) {
 			Expect(12);
 			Attribute(
-#line  2276 "VBNET.ATG" 
+#line  2286 "VBNET.ATG" 
 out attribute);
 
-#line  2276 "VBNET.ATG" 
+#line  2286 "VBNET.ATG" 
 			attributes.Add(attribute); 
 		}
 		if (la.kind == 12) {
@@ -683,7 +685,7 @@ out attribute);
 		}
 		Expect(26);
 
-#line  2280 "VBNET.ATG" 
+#line  2290 "VBNET.ATG" 
 		section = new AttributeSection(attributeTarget, attributes);
 		section.StartLocation = startPos;
 		section.EndLocation = t.EndLocation;
@@ -691,69 +693,69 @@ out attribute);
 	}
 
 	void TypeModifier(
-#line  2973 "VBNET.ATG" 
+#line  2982 "VBNET.ATG" 
 Modifiers m) {
 		switch (la.kind) {
 		case 148: {
 			lexer.NextToken();
 
-#line  2974 "VBNET.ATG" 
+#line  2983 "VBNET.ATG" 
 			m.Add(Modifier.Public, t.Location); 
 			break;
 		}
 		case 147: {
 			lexer.NextToken();
 
-#line  2975 "VBNET.ATG" 
+#line  2984 "VBNET.ATG" 
 			m.Add(Modifier.Protected, t.Location); 
 			break;
 		}
 		case 99: {
 			lexer.NextToken();
 
-#line  2976 "VBNET.ATG" 
+#line  2985 "VBNET.ATG" 
 			m.Add(Modifier.Internal, t.Location); 
 			break;
 		}
 		case 145: {
 			lexer.NextToken();
 
-#line  2977 "VBNET.ATG" 
+#line  2986 "VBNET.ATG" 
 			m.Add(Modifier.Private, t.Location); 
 			break;
 		}
 		case 158: {
 			lexer.NextToken();
 
-#line  2978 "VBNET.ATG" 
+#line  2987 "VBNET.ATG" 
 			m.Add(Modifier.Static, t.Location); 
 			break;
 		}
 		case 157: {
 			lexer.NextToken();
 
-#line  2979 "VBNET.ATG" 
+#line  2988 "VBNET.ATG" 
 			m.Add(Modifier.New, t.Location); 
 			break;
 		}
 		case 122: {
 			lexer.NextToken();
 
-#line  2980 "VBNET.ATG" 
+#line  2989 "VBNET.ATG" 
 			m.Add(Modifier.Abstract, t.Location); 
 			break;
 		}
 		case 131: {
 			lexer.NextToken();
 
-#line  2981 "VBNET.ATG" 
+#line  2990 "VBNET.ATG" 
 			m.Add(Modifier.Sealed, t.Location); 
 			break;
 		}
 		case 203: {
 			lexer.NextToken();
 
-#line  2982 "VBNET.ATG" 
+#line  2991 "VBNET.ATG" 
 			m.Add(Modifier.Partial, t.Location); 
 			break;
 		}
@@ -762,21 +764,21 @@ Modifiers m) {
 	}
 
 	void NonModuleDeclaration(
-#line  647 "VBNET.ATG" 
+#line  649 "VBNET.ATG" 
 Modifiers m, List<AttributeSection> attributes) {
 
-#line  649 "VBNET.ATG" 
+#line  651 "VBNET.ATG" 
 		TypeReference typeRef = null;
 		List<TypeReference> baseInterfaces = null;
 		
 		switch (la.kind) {
 		case 67: {
 
-#line  652 "VBNET.ATG" 
+#line  654 "VBNET.ATG" 
 			m.Check(Modifier.Classes); 
 			lexer.NextToken();
 
-#line  655 "VBNET.ATG" 
+#line  657 "VBNET.ATG" 
 			TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes);
 			newType.StartLocation = t.Location;
 			compilationUnit.AddChild(newType);
@@ -786,36 +788,36 @@ Modifiers m, List<AttributeSection> attributes) {
 			
 			Identifier();
 
-#line  662 "VBNET.ATG" 
+#line  664 "VBNET.ATG" 
 			newType.Name = t.val; 
 			TypeParameterList(
-#line  663 "VBNET.ATG" 
+#line  665 "VBNET.ATG" 
 newType.Templates);
 			EndOfStmt();
 
-#line  665 "VBNET.ATG" 
+#line  667 "VBNET.ATG" 
 			newType.BodyStartLocation = t.Location; 
 			if (la.kind == 110) {
 				ClassBaseType(
-#line  666 "VBNET.ATG" 
+#line  668 "VBNET.ATG" 
 out typeRef);
 
-#line  666 "VBNET.ATG" 
+#line  668 "VBNET.ATG" 
 				newType.BaseTypes.Add(typeRef); 
 			}
 			while (la.kind == 107) {
 				TypeImplementsClause(
-#line  667 "VBNET.ATG" 
+#line  669 "VBNET.ATG" 
 out baseInterfaces);
 
-#line  667 "VBNET.ATG" 
+#line  669 "VBNET.ATG" 
 				newType.BaseTypes.AddRange(baseInterfaces); 
 			}
 			ClassBody(
-#line  668 "VBNET.ATG" 
+#line  670 "VBNET.ATG" 
 newType);
 
-#line  670 "VBNET.ATG" 
+#line  672 "VBNET.ATG" 
 			compilationUnit.BlockEnd();
 			
 			break;
@@ -823,7 +825,7 @@ newType);
 		case 121: {
 			lexer.NextToken();
 
-#line  674 "VBNET.ATG" 
+#line  676 "VBNET.ATG" 
 			m.Check(Modifier.VBModules);
 			TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes);
 			compilationUnit.AddChild(newType);
@@ -833,17 +835,17 @@ newType);
 			
 			Identifier();
 
-#line  681 "VBNET.ATG" 
+#line  683 "VBNET.ATG" 
 			newType.Name = t.val; 
 			Expect(1);
 
-#line  683 "VBNET.ATG" 
+#line  685 "VBNET.ATG" 
 			newType.BodyStartLocation = t.Location; 
 			ModuleBody(
-#line  684 "VBNET.ATG" 
+#line  686 "VBNET.ATG" 
 newType);
 
-#line  686 "VBNET.ATG" 
+#line  688 "VBNET.ATG" 
 			compilationUnit.BlockEnd();
 			
 			break;
@@ -851,7 +853,7 @@ newType);
 		case 166: {
 			lexer.NextToken();
 
-#line  690 "VBNET.ATG" 
+#line  692 "VBNET.ATG" 
 			m.Check(Modifier.VBStructures);
 			TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes);
 			compilationUnit.AddChild(newType);
@@ -861,28 +863,28 @@ newType);
 			
 			Identifier();
 
-#line  697 "VBNET.ATG" 
+#line  699 "VBNET.ATG" 
 			newType.Name = t.val; 
 			TypeParameterList(
-#line  698 "VBNET.ATG" 
+#line  700 "VBNET.ATG" 
 newType.Templates);
 			Expect(1);
 
-#line  700 "VBNET.ATG" 
+#line  702 "VBNET.ATG" 
 			newType.BodyStartLocation = t.Location; 
 			while (la.kind == 107) {
 				TypeImplementsClause(
-#line  701 "VBNET.ATG" 
+#line  703 "VBNET.ATG" 
 out baseInterfaces);
 
-#line  701 "VBNET.ATG" 
+#line  703 "VBNET.ATG" 
 				newType.BaseTypes.AddRange(baseInterfaces);
 			}
 			StructureBody(
-#line  702 "VBNET.ATG" 
+#line  704 "VBNET.ATG" 
 newType);
 
-#line  704 "VBNET.ATG" 
+#line  706 "VBNET.ATG" 
 			compilationUnit.BlockEnd();
 			
 			break;
@@ -890,7 +892,7 @@ newType);
 		case 90: {
 			lexer.NextToken();
 
-#line  709 "VBNET.ATG" 
+#line  711 "VBNET.ATG" 
 			m.Check(Modifier.VBEnums);
 			TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes);
 			newType.StartLocation = m.GetDeclarationLocation(t.Location);
@@ -901,26 +903,26 @@ newType);
 			
 			Identifier();
 
-#line  717 "VBNET.ATG" 
+#line  719 "VBNET.ATG" 
 			newType.Name = t.val; 
 			if (la.kind == 48) {
 				lexer.NextToken();
 				NonArrayTypeName(
-#line  718 "VBNET.ATG" 
+#line  720 "VBNET.ATG" 
 out typeRef, false);
 
-#line  718 "VBNET.ATG" 
+#line  720 "VBNET.ATG" 
 				newType.BaseTypes.Add(typeRef); 
 			}
 			Expect(1);
 
-#line  720 "VBNET.ATG" 
+#line  722 "VBNET.ATG" 
 			newType.BodyStartLocation = t.Location; 
 			EnumBody(
-#line  721 "VBNET.ATG" 
+#line  723 "VBNET.ATG" 
 newType);
 
-#line  723 "VBNET.ATG" 
+#line  725 "VBNET.ATG" 
 			compilationUnit.BlockEnd();
 			
 			break;
@@ -928,7 +930,7 @@ newType);
 		case 112: {
 			lexer.NextToken();
 
-#line  728 "VBNET.ATG" 
+#line  730 "VBNET.ATG" 
 			m.Check(Modifier.VBInterfacs);
 			TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes);
 			newType.StartLocation = m.GetDeclarationLocation(t.Location);
@@ -938,28 +940,28 @@ newType);
 			
 			Identifier();
 
-#line  735 "VBNET.ATG" 
+#line  737 "VBNET.ATG" 
 			newType.Name = t.val; 
 			TypeParameterList(
-#line  736 "VBNET.ATG" 
+#line  738 "VBNET.ATG" 
 newType.Templates);
 			EndOfStmt();
 
-#line  738 "VBNET.ATG" 
+#line  740 "VBNET.ATG" 
 			newType.BodyStartLocation = t.Location; 
 			while (la.kind == 110) {
 				InterfaceBase(
-#line  739 "VBNET.ATG" 
+#line  741 "VBNET.ATG" 
 out baseInterfaces);
 
-#line  739 "VBNET.ATG" 
+#line  741 "VBNET.ATG" 
 				newType.BaseTypes.AddRange(baseInterfaces); 
 			}
 			InterfaceBody(
-#line  740 "VBNET.ATG" 
+#line  742 "VBNET.ATG" 
 newType);
 
-#line  742 "VBNET.ATG" 
+#line  744 "VBNET.ATG" 
 			compilationUnit.BlockEnd();
 			
 			break;
@@ -967,7 +969,7 @@ newType);
 		case 80: {
 			lexer.NextToken();
 
-#line  747 "VBNET.ATG" 
+#line  749 "VBNET.ATG" 
 			m.Check(Modifier.VBDelegates);
 			DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes);
 			delegateDeclr.ReturnType = new TypeReference("", "System.Void");
@@ -978,63 +980,63 @@ newType);
 				lexer.NextToken();
 				Identifier();
 
-#line  754 "VBNET.ATG" 
+#line  756 "VBNET.ATG" 
 				delegateDeclr.Name = t.val; 
 				TypeParameterList(
-#line  755 "VBNET.ATG" 
+#line  757 "VBNET.ATG" 
 delegateDeclr.Templates);
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  756 "VBNET.ATG" 
+#line  758 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
 
-#line  756 "VBNET.ATG" 
+#line  758 "VBNET.ATG" 
 					delegateDeclr.Parameters = p; 
 				}
 			} else if (la.kind == 100) {
 				lexer.NextToken();
 				Identifier();
 
-#line  758 "VBNET.ATG" 
+#line  760 "VBNET.ATG" 
 				delegateDeclr.Name = t.val; 
 				TypeParameterList(
-#line  759 "VBNET.ATG" 
+#line  761 "VBNET.ATG" 
 delegateDeclr.Templates);
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  760 "VBNET.ATG" 
+#line  762 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
 
-#line  760 "VBNET.ATG" 
+#line  762 "VBNET.ATG" 
 					delegateDeclr.Parameters = p; 
 				}
 				if (la.kind == 48) {
 					lexer.NextToken();
 
-#line  761 "VBNET.ATG" 
+#line  763 "VBNET.ATG" 
 					TypeReference type; 
 					TypeName(
-#line  761 "VBNET.ATG" 
+#line  763 "VBNET.ATG" 
 out type);
 
-#line  761 "VBNET.ATG" 
+#line  763 "VBNET.ATG" 
 					delegateDeclr.ReturnType = type; 
 				}
 			} else SynErr(214);
 
-#line  763 "VBNET.ATG" 
+#line  765 "VBNET.ATG" 
 			delegateDeclr.EndLocation = t.EndLocation; 
 			Expect(1);
 
-#line  766 "VBNET.ATG" 
+#line  768 "VBNET.ATG" 
 			compilationUnit.AddChild(delegateDeclr);
 			
 			break;
@@ -1044,31 +1046,31 @@ out type);
 	}
 
 	void TypeParameterList(
-#line  600 "VBNET.ATG" 
+#line  602 "VBNET.ATG" 
 List<TemplateDefinition> templates) {
 
-#line  602 "VBNET.ATG" 
+#line  604 "VBNET.ATG" 
 		TemplateDefinition template;
 		
 		if (
-#line  605 "VBNET.ATG" 
+#line  607 "VBNET.ATG" 
 la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) {
 			lexer.NextToken();
 			Expect(200);
 			TypeParameter(
-#line  606 "VBNET.ATG" 
+#line  608 "VBNET.ATG" 
 out template);
 
-#line  608 "VBNET.ATG" 
+#line  610 "VBNET.ATG" 
 			if (template != null) templates.Add(template);
 			
 			while (la.kind == 12) {
 				lexer.NextToken();
 				TypeParameter(
-#line  611 "VBNET.ATG" 
+#line  613 "VBNET.ATG" 
 out template);
 
-#line  613 "VBNET.ATG" 
+#line  615 "VBNET.ATG" 
 				if (template != null) templates.Add(template);
 				
 			}
@@ -1077,15 +1079,15 @@ out template);
 	}
 
 	void TypeParameter(
-#line  621 "VBNET.ATG" 
+#line  623 "VBNET.ATG" 
 out TemplateDefinition template) {
 		Identifier();
 
-#line  623 "VBNET.ATG" 
+#line  625 "VBNET.ATG" 
 		template = new TemplateDefinition(t.val, null); 
 		if (la.kind == 48) {
 			TypeParameterConstraints(
-#line  624 "VBNET.ATG" 
+#line  626 "VBNET.ATG" 
 template);
 		}
 	}
@@ -1108,6 +1110,10 @@ template);
 			lexer.NextToken();
 			break;
 		}
+		case 204: {
+			lexer.NextToken();
+			break;
+		}
 		case 49: {
 			lexer.NextToken();
 			break;
@@ -1137,199 +1143,199 @@ template);
 	}
 
 	void TypeParameterConstraints(
-#line  628 "VBNET.ATG" 
+#line  630 "VBNET.ATG" 
 TemplateDefinition template) {
 
-#line  630 "VBNET.ATG" 
+#line  632 "VBNET.ATG" 
 		TypeReference constraint;
 		
 		Expect(48);
 		if (la.kind == 22) {
 			lexer.NextToken();
 			TypeName(
-#line  636 "VBNET.ATG" 
+#line  638 "VBNET.ATG" 
 out constraint);
 
-#line  636 "VBNET.ATG" 
+#line  638 "VBNET.ATG" 
 			if (constraint != null) { template.Bases.Add(constraint); } 
 			while (la.kind == 12) {
 				lexer.NextToken();
 				TypeName(
-#line  639 "VBNET.ATG" 
+#line  641 "VBNET.ATG" 
 out constraint);
 
-#line  639 "VBNET.ATG" 
+#line  641 "VBNET.ATG" 
 				if (constraint != null) { template.Bases.Add(constraint); } 
 			}
 			Expect(23);
 		} else if (StartOf(5)) {
 			TypeName(
-#line  642 "VBNET.ATG" 
+#line  644 "VBNET.ATG" 
 out constraint);
 
-#line  642 "VBNET.ATG" 
+#line  644 "VBNET.ATG" 
 			if (constraint != null) { template.Bases.Add(constraint); } 
 		} else SynErr(217);
 	}
 
 	void ClassBaseType(
-#line  943 "VBNET.ATG" 
+#line  945 "VBNET.ATG" 
 out TypeReference typeRef) {
 
-#line  945 "VBNET.ATG" 
+#line  947 "VBNET.ATG" 
 		typeRef = null;
 		
 		Expect(110);
 		TypeName(
-#line  948 "VBNET.ATG" 
+#line  950 "VBNET.ATG" 
 out typeRef);
 		EndOfStmt();
 	}
 
 	void TypeImplementsClause(
-#line  1683 "VBNET.ATG" 
+#line  1692 "VBNET.ATG" 
 out List<TypeReference> baseInterfaces) {
 
-#line  1685 "VBNET.ATG" 
+#line  1694 "VBNET.ATG" 
 		baseInterfaces = new List<TypeReference>();
 		TypeReference type = null;
 		
 		Expect(107);
 		TypeName(
-#line  1688 "VBNET.ATG" 
+#line  1697 "VBNET.ATG" 
 out type);
 
-#line  1690 "VBNET.ATG" 
+#line  1699 "VBNET.ATG" 
 		baseInterfaces.Add(type);
 		
 		while (la.kind == 12) {
 			lexer.NextToken();
 			TypeName(
-#line  1693 "VBNET.ATG" 
+#line  1702 "VBNET.ATG" 
 out type);
 
-#line  1694 "VBNET.ATG" 
+#line  1703 "VBNET.ATG" 
 			baseInterfaces.Add(type); 
 		}
 		EndOfStmt();
 	}
 
 	void ClassBody(
-#line  776 "VBNET.ATG" 
+#line  778 "VBNET.ATG" 
 TypeDeclaration newType) {
 
-#line  777 "VBNET.ATG" 
+#line  779 "VBNET.ATG" 
 		AttributeSection section; 
 		while (StartOf(6)) {
 
-#line  779 "VBNET.ATG" 
+#line  781 "VBNET.ATG" 
 			List<AttributeSection> attributes = new List<AttributeSection>();
 			Modifiers m = new Modifiers();
 			
 			while (la.kind == 27) {
 				AttributeSection(
-#line  782 "VBNET.ATG" 
+#line  784 "VBNET.ATG" 
 out section);
 
-#line  782 "VBNET.ATG" 
+#line  784 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			while (StartOf(7)) {
 				MemberModifier(
-#line  783 "VBNET.ATG" 
+#line  785 "VBNET.ATG" 
 m);
 			}
 			ClassMemberDecl(
-#line  784 "VBNET.ATG" 
+#line  786 "VBNET.ATG" 
 m, attributes);
 		}
 		Expect(88);
 		Expect(67);
 
-#line  786 "VBNET.ATG" 
+#line  788 "VBNET.ATG" 
 		newType.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void ModuleBody(
-#line  805 "VBNET.ATG" 
+#line  807 "VBNET.ATG" 
 TypeDeclaration newType) {
 
-#line  806 "VBNET.ATG" 
+#line  808 "VBNET.ATG" 
 		AttributeSection section; 
 		while (StartOf(6)) {
 
-#line  808 "VBNET.ATG" 
+#line  810 "VBNET.ATG" 
 			List<AttributeSection> attributes = new List<AttributeSection>();
 			Modifiers m = new Modifiers();
 			
 			while (la.kind == 27) {
 				AttributeSection(
-#line  811 "VBNET.ATG" 
+#line  813 "VBNET.ATG" 
 out section);
 
-#line  811 "VBNET.ATG" 
+#line  813 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			while (StartOf(7)) {
 				MemberModifier(
-#line  812 "VBNET.ATG" 
+#line  814 "VBNET.ATG" 
 m);
 			}
 			ClassMemberDecl(
-#line  813 "VBNET.ATG" 
+#line  815 "VBNET.ATG" 
 m, attributes);
 		}
 		Expect(88);
 		Expect(121);
 
-#line  815 "VBNET.ATG" 
+#line  817 "VBNET.ATG" 
 		newType.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void StructureBody(
-#line  790 "VBNET.ATG" 
+#line  792 "VBNET.ATG" 
 TypeDeclaration newType) {
 
-#line  791 "VBNET.ATG" 
+#line  793 "VBNET.ATG" 
 		AttributeSection section; 
 		while (StartOf(6)) {
 
-#line  793 "VBNET.ATG" 
+#line  795 "VBNET.ATG" 
 			List<AttributeSection> attributes = new List<AttributeSection>();
 			Modifiers m = new Modifiers();
 			
 			while (la.kind == 27) {
 				AttributeSection(
-#line  796 "VBNET.ATG" 
+#line  798 "VBNET.ATG" 
 out section);
 
-#line  796 "VBNET.ATG" 
+#line  798 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			while (StartOf(7)) {
 				MemberModifier(
-#line  797 "VBNET.ATG" 
+#line  799 "VBNET.ATG" 
 m);
 			}
 			StructureMemberDecl(
-#line  798 "VBNET.ATG" 
+#line  800 "VBNET.ATG" 
 m, attributes);
 		}
 		Expect(88);
 		Expect(166);
 
-#line  800 "VBNET.ATG" 
+#line  802 "VBNET.ATG" 
 		newType.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void NonArrayTypeName(
-#line  2100 "VBNET.ATG" 
+#line  2110 "VBNET.ATG" 
 out TypeReference typeref, bool canBeUnbound) {
 
-#line  2102 "VBNET.ATG" 
+#line  2112 "VBNET.ATG" 
 		string name;
 		typeref = null;
 		bool isGlobal = false;
@@ -1339,93 +1345,93 @@ out TypeReference typeref, bool canBeUnbound) {
 				lexer.NextToken();
 				Expect(10);
 
-#line  2107 "VBNET.ATG" 
+#line  2117 "VBNET.ATG" 
 				isGlobal = true; 
 			}
 			QualIdentAndTypeArguments(
-#line  2108 "VBNET.ATG" 
+#line  2118 "VBNET.ATG" 
 out typeref, canBeUnbound);
 
-#line  2109 "VBNET.ATG" 
+#line  2119 "VBNET.ATG" 
 			typeref.IsGlobal = isGlobal; 
 			while (la.kind == 10) {
 				lexer.NextToken();
 
-#line  2110 "VBNET.ATG" 
+#line  2120 "VBNET.ATG" 
 				TypeReference nestedTypeRef; 
 				QualIdentAndTypeArguments(
-#line  2111 "VBNET.ATG" 
+#line  2121 "VBNET.ATG" 
 out nestedTypeRef, canBeUnbound);
 
-#line  2112 "VBNET.ATG" 
+#line  2122 "VBNET.ATG" 
 				typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); 
 			}
 		} else if (la.kind == 133) {
 			lexer.NextToken();
 
-#line  2115 "VBNET.ATG" 
+#line  2125 "VBNET.ATG" 
 			typeref = new TypeReference("System.Object"); 
 		} else if (StartOf(9)) {
 			PrimitiveTypeName(
-#line  2116 "VBNET.ATG" 
+#line  2126 "VBNET.ATG" 
 out name);
 
-#line  2116 "VBNET.ATG" 
+#line  2126 "VBNET.ATG" 
 			typeref = new TypeReference(name); 
 		} else SynErr(218);
 	}
 
 	void EnumBody(
-#line  819 "VBNET.ATG" 
+#line  821 "VBNET.ATG" 
 TypeDeclaration newType) {
 
-#line  820 "VBNET.ATG" 
+#line  822 "VBNET.ATG" 
 		FieldDeclaration f; 
 		while (StartOf(10)) {
 			EnumMemberDecl(
-#line  822 "VBNET.ATG" 
+#line  824 "VBNET.ATG" 
 out f);
 
-#line  822 "VBNET.ATG" 
+#line  824 "VBNET.ATG" 
 			compilationUnit.AddChild(f); 
 		}
 		Expect(88);
 		Expect(90);
 
-#line  824 "VBNET.ATG" 
+#line  826 "VBNET.ATG" 
 		newType.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void InterfaceBase(
-#line  1668 "VBNET.ATG" 
+#line  1677 "VBNET.ATG" 
 out List<TypeReference> bases) {
 
-#line  1670 "VBNET.ATG" 
+#line  1679 "VBNET.ATG" 
 		TypeReference type;
 		bases = new List<TypeReference>();
 		
 		Expect(110);
 		TypeName(
-#line  1674 "VBNET.ATG" 
+#line  1683 "VBNET.ATG" 
 out type);
 
-#line  1674 "VBNET.ATG" 
+#line  1683 "VBNET.ATG" 
 		bases.Add(type); 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			TypeName(
-#line  1677 "VBNET.ATG" 
+#line  1686 "VBNET.ATG" 
 out type);
 
-#line  1677 "VBNET.ATG" 
+#line  1686 "VBNET.ATG" 
 			bases.Add(type); 
 		}
 		Expect(1);
 	}
 
 	void InterfaceBody(
-#line  828 "VBNET.ATG" 
+#line  830 "VBNET.ATG" 
 TypeDeclaration newType) {
 		while (StartOf(11)) {
 			InterfaceMemberDecl();
@@ -1433,33 +1439,33 @@ TypeDeclaration newType) {
 		Expect(88);
 		Expect(112);
 
-#line  830 "VBNET.ATG" 
+#line  832 "VBNET.ATG" 
 		newType.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void FormalParameterList(
-#line  2287 "VBNET.ATG" 
+#line  2297 "VBNET.ATG" 
 List<ParameterDeclarationExpression> parameter) {
 
-#line  2289 "VBNET.ATG" 
+#line  2299 "VBNET.ATG" 
 		ParameterDeclarationExpression p;
 		AttributeSection section;
 		List<AttributeSection> attributes = new List<AttributeSection>();
 		
 		while (la.kind == 27) {
 			AttributeSection(
-#line  2293 "VBNET.ATG" 
+#line  2303 "VBNET.ATG" 
 out section);
 
-#line  2293 "VBNET.ATG" 
+#line  2303 "VBNET.ATG" 
 			attributes.Add(section); 
 		}
 		FormalParameter(
-#line  2295 "VBNET.ATG" 
+#line  2305 "VBNET.ATG" 
 out p);
 
-#line  2297 "VBNET.ATG" 
+#line  2307 "VBNET.ATG" 
 		bool paramsFound = false;
 		p.Attributes = attributes;
 		parameter.Add(p);
@@ -1467,152 +1473,152 @@ out p);
 		while (la.kind == 12) {
 			lexer.NextToken();
 
-#line  2302 "VBNET.ATG" 
+#line  2312 "VBNET.ATG" 
 			if (paramsFound) Error("params array must be at end of parameter list"); 
 			while (la.kind == 27) {
 				AttributeSection(
-#line  2303 "VBNET.ATG" 
+#line  2313 "VBNET.ATG" 
 out section);
 
-#line  2303 "VBNET.ATG" 
+#line  2313 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			FormalParameter(
-#line  2305 "VBNET.ATG" 
+#line  2315 "VBNET.ATG" 
 out p);
 
-#line  2305 "VBNET.ATG" 
+#line  2315 "VBNET.ATG" 
 			p.Attributes = attributes; parameter.Add(p); 
 		}
 	}
 
 	void MemberModifier(
-#line  2985 "VBNET.ATG" 
+#line  2994 "VBNET.ATG" 
 Modifiers m) {
 		switch (la.kind) {
 		case 122: {
 			lexer.NextToken();
 
-#line  2986 "VBNET.ATG" 
+#line  2995 "VBNET.ATG" 
 			m.Add(Modifier.Abstract, t.Location);
 			break;
 		}
 		case 79: {
 			lexer.NextToken();
 
-#line  2987 "VBNET.ATG" 
+#line  2996 "VBNET.ATG" 
 			m.Add(Modifier.Default, t.Location);
 			break;
 		}
 		case 99: {
 			lexer.NextToken();
 
-#line  2988 "VBNET.ATG" 
+#line  2997 "VBNET.ATG" 
 			m.Add(Modifier.Internal, t.Location);
 			break;
 		}
 		case 157: {
 			lexer.NextToken();
 
-#line  2989 "VBNET.ATG" 
+#line  2998 "VBNET.ATG" 
 			m.Add(Modifier.New, t.Location);
 			break;
 		}
 		case 142: {
 			lexer.NextToken();
 
-#line  2990 "VBNET.ATG" 
+#line  2999 "VBNET.ATG" 
 			m.Add(Modifier.Override, t.Location);
 			break;
 		}
 		case 123: {
 			lexer.NextToken();
 
-#line  2991 "VBNET.ATG" 
+#line  3000 "VBNET.ATG" 
 			m.Add(Modifier.Abstract, t.Location);
 			break;
 		}
 		case 145: {
 			lexer.NextToken();
 
-#line  2992 "VBNET.ATG" 
+#line  3001 "VBNET.ATG" 
 			m.Add(Modifier.Private, t.Location);
 			break;
 		}
 		case 147: {
 			lexer.NextToken();
 
-#line  2993 "VBNET.ATG" 
+#line  3002 "VBNET.ATG" 
 			m.Add(Modifier.Protected, t.Location);
 			break;
 		}
 		case 148: {
 			lexer.NextToken();
 
-#line  2994 "VBNET.ATG" 
+#line  3003 "VBNET.ATG" 
 			m.Add(Modifier.Public, t.Location);
 			break;
 		}
 		case 131: {
 			lexer.NextToken();
 
-#line  2995 "VBNET.ATG" 
+#line  3004 "VBNET.ATG" 
 			m.Add(Modifier.Sealed, t.Location);
 			break;
 		}
 		case 132: {
 			lexer.NextToken();
 
-#line  2996 "VBNET.ATG" 
+#line  3005 "VBNET.ATG" 
 			m.Add(Modifier.Sealed, t.Location);
 			break;
 		}
 		case 158: {
 			lexer.NextToken();
 
-#line  2997 "VBNET.ATG" 
+#line  3006 "VBNET.ATG" 
 			m.Add(Modifier.Static, t.Location);
 			break;
 		}
 		case 141: {
 			lexer.NextToken();
 
-#line  2998 "VBNET.ATG" 
+#line  3007 "VBNET.ATG" 
 			m.Add(Modifier.Virtual, t.Location);
 			break;
 		}
 		case 140: {
 			lexer.NextToken();
 
-#line  2999 "VBNET.ATG" 
+#line  3008 "VBNET.ATG" 
 			m.Add(Modifier.Overloads, t.Location);
 			break;
 		}
 		case 150: {
 			lexer.NextToken();
 
-#line  3000 "VBNET.ATG" 
+#line  3009 "VBNET.ATG" 
 			m.Add(Modifier.ReadOnly, t.Location);
 			break;
 		}
 		case 184: {
 			lexer.NextToken();
 
-#line  3001 "VBNET.ATG" 
+#line  3010 "VBNET.ATG" 
 			m.Add(Modifier.WriteOnly, t.Location);
 			break;
 		}
 		case 183: {
 			lexer.NextToken();
 
-#line  3002 "VBNET.ATG" 
+#line  3011 "VBNET.ATG" 
 			m.Add(Modifier.WithEvents, t.Location);
 			break;
 		}
 		case 81: {
 			lexer.NextToken();
 
-#line  3003 "VBNET.ATG" 
+#line  3012 "VBNET.ATG" 
 			m.Add(Modifier.Dim, t.Location);
 			break;
 		}
@@ -1621,18 +1627,18 @@ Modifiers m) {
 	}
 
 	void ClassMemberDecl(
-#line  939 "VBNET.ATG" 
+#line  941 "VBNET.ATG" 
 Modifiers m, List<AttributeSection> attributes) {
 		StructureMemberDecl(
-#line  940 "VBNET.ATG" 
+#line  942 "VBNET.ATG" 
 m, attributes);
 	}
 
 	void StructureMemberDecl(
-#line  953 "VBNET.ATG" 
+#line  955 "VBNET.ATG" 
 Modifiers m, List<AttributeSection> attributes) {
 
-#line  955 "VBNET.ATG" 
+#line  957 "VBNET.ATG" 
 		TypeReference type = null;
 		List<ParameterDeclarationExpression> p = new List<ParameterDeclarationExpression>();
 		Statement stmt = null;
@@ -1642,37 +1648,37 @@ Modifiers m, List<AttributeSection> attributes) {
 		switch (la.kind) {
 		case 67: case 80: case 90: case 112: case 121: case 166: {
 			NonModuleDeclaration(
-#line  961 "VBNET.ATG" 
+#line  964 "VBNET.ATG" 
 m, attributes);
 			break;
 		}
 		case 167: {
 			lexer.NextToken();
 
-#line  965 "VBNET.ATG" 
+#line  968 "VBNET.ATG" 
 			Point startPos = t.Location;
 			
 			if (StartOf(12)) {
 
-#line  969 "VBNET.ATG" 
+#line  972 "VBNET.ATG" 
 				string name = String.Empty;
 				MethodDeclaration methodDeclaration; List<string> handlesClause = null;
 				List<InterfaceImplementation> implementsClause = null;
 				
 				Identifier();
 
-#line  975 "VBNET.ATG" 
+#line  978 "VBNET.ATG" 
 				name = t.val;
 				m.Check(Modifier.VBMethods);
 				
 				TypeParameterList(
-#line  978 "VBNET.ATG" 
+#line  981 "VBNET.ATG" 
 templates);
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  979 "VBNET.ATG" 
+#line  982 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -1680,23 +1686,23 @@ p);
 				if (la.kind == 105 || la.kind == 107) {
 					if (la.kind == 107) {
 						ImplementsClause(
-#line  982 "VBNET.ATG" 
+#line  985 "VBNET.ATG" 
 out implementsClause);
 					} else {
 						HandlesClause(
-#line  984 "VBNET.ATG" 
+#line  987 "VBNET.ATG" 
 out handlesClause);
 					}
 				}
 
-#line  987 "VBNET.ATG" 
+#line  990 "VBNET.ATG" 
 				Point endLocation = t.EndLocation; 
 				Expect(1);
 				if (
-#line  991 "VBNET.ATG" 
+#line  994 "VBNET.ATG" 
 IsMustOverride(m)) {
 
-#line  993 "VBNET.ATG" 
+#line  996 "VBNET.ATG" 
 					methodDeclaration = new MethodDeclaration(name, m.Modifier,  null, p, attributes);
 					methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 					methodDeclaration.EndLocation   = endLocation;
@@ -1710,7 +1716,7 @@ IsMustOverride(m)) {
 					
 				} else if (StartOf(13)) {
 
-#line  1006 "VBNET.ATG" 
+#line  1009 "VBNET.ATG" 
 					methodDeclaration = new MethodDeclaration(name, m.Modifier,  null, p, attributes);
 					methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 					methodDeclaration.EndLocation   = endLocation;
@@ -1724,17 +1730,17 @@ IsMustOverride(m)) {
 					compilationUnit.BlockStart(methodDeclaration);
 					
 					Block(
-#line  1018 "VBNET.ATG" 
+#line  1021 "VBNET.ATG" 
 out stmt);
 
-#line  1020 "VBNET.ATG" 
+#line  1023 "VBNET.ATG" 
 					compilationUnit.BlockEnd();
 					methodDeclaration.Body  = (BlockStatement)stmt;
 					
 					Expect(88);
 					Expect(167);
 
-#line  1023 "VBNET.ATG" 
+#line  1026 "VBNET.ATG" 
 					methodDeclaration.Body.EndLocation = t.EndLocation; 
 					Expect(1);
 				} else SynErr(220);
@@ -1744,29 +1750,29 @@ out stmt);
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  1026 "VBNET.ATG" 
+#line  1029 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
 				}
 
-#line  1027 "VBNET.ATG" 
+#line  1030 "VBNET.ATG" 
 				m.Check(Modifier.Constructors); 
 
-#line  1028 "VBNET.ATG" 
+#line  1031 "VBNET.ATG" 
 				Point constructorEndLocation = t.EndLocation; 
 				Expect(1);
 				Block(
-#line  1030 "VBNET.ATG" 
+#line  1033 "VBNET.ATG" 
 out stmt);
 				Expect(88);
 				Expect(167);
 
-#line  1031 "VBNET.ATG" 
+#line  1034 "VBNET.ATG" 
 				Point endLocation = t.EndLocation; 
 				Expect(1);
 
-#line  1033 "VBNET.ATG" 
+#line  1036 "VBNET.ATG" 
 				ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); 
 				cd.StartLocation = m.GetDeclarationLocation(startPos);
 				cd.EndLocation   = constructorEndLocation;
@@ -1780,7 +1786,7 @@ out stmt);
 		case 100: {
 			lexer.NextToken();
 
-#line  1045 "VBNET.ATG" 
+#line  1048 "VBNET.ATG" 
 			m.Check(Modifier.VBMethods);
 			string name = String.Empty;
 			Point startPos = t.Location;
@@ -1790,16 +1796,16 @@ out stmt);
 			
 			Identifier();
 
-#line  1052 "VBNET.ATG" 
+#line  1055 "VBNET.ATG" 
 			name = t.val; 
 			TypeParameterList(
-#line  1053 "VBNET.ATG" 
+#line  1056 "VBNET.ATG" 
 templates);
 			if (la.kind == 24) {
 				lexer.NextToken();
 				if (StartOf(4)) {
 					FormalParameterList(
-#line  1054 "VBNET.ATG" 
+#line  1057 "VBNET.ATG" 
 p);
 				}
 				Expect(25);
@@ -1808,15 +1814,15 @@ p);
 				lexer.NextToken();
 				while (la.kind == 27) {
 					AttributeSection(
-#line  1055 "VBNET.ATG" 
+#line  1058 "VBNET.ATG" 
 out returnTypeAttributeSection);
 				}
 				TypeName(
-#line  1055 "VBNET.ATG" 
+#line  1058 "VBNET.ATG" 
 out type);
 			}
 
-#line  1057 "VBNET.ATG" 
+#line  1060 "VBNET.ATG" 
 			if(type == null) {
 			type = new TypeReference("System.Object");
 			}
@@ -1824,20 +1830,20 @@ out type);
 			if (la.kind == 105 || la.kind == 107) {
 				if (la.kind == 107) {
 					ImplementsClause(
-#line  1063 "VBNET.ATG" 
+#line  1066 "VBNET.ATG" 
 out implementsClause);
 				} else {
 					HandlesClause(
-#line  1065 "VBNET.ATG" 
+#line  1068 "VBNET.ATG" 
 out handlesClause);
 				}
 			}
 			Expect(1);
 			if (
-#line  1071 "VBNET.ATG" 
+#line  1074 "VBNET.ATG" 
 IsMustOverride(m)) {
 
-#line  1073 "VBNET.ATG" 
+#line  1076 "VBNET.ATG" 
 				methodDeclaration = new MethodDeclaration(name, m.Modifier,  type, p, attributes);
 				methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 				methodDeclaration.EndLocation   = t.EndLocation;
@@ -1853,7 +1859,7 @@ IsMustOverride(m)) {
 				
 			} else if (StartOf(13)) {
 
-#line  1088 "VBNET.ATG" 
+#line  1091 "VBNET.ATG" 
 				methodDeclaration = new MethodDeclaration(name, m.Modifier,  type, p, attributes);
 				methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 				methodDeclaration.EndLocation   = t.EndLocation;
@@ -1870,17 +1876,17 @@ IsMustOverride(m)) {
 				compilationUnit.BlockStart(methodDeclaration);
 				
 				Block(
-#line  1103 "VBNET.ATG" 
+#line  1106 "VBNET.ATG" 
 out stmt);
 
-#line  1105 "VBNET.ATG" 
+#line  1108 "VBNET.ATG" 
 				compilationUnit.BlockEnd();
 				methodDeclaration.Body  = (BlockStatement)stmt;
 				
 				Expect(88);
 				Expect(100);
 
-#line  1110 "VBNET.ATG" 
+#line  1113 "VBNET.ATG" 
 				methodDeclaration.Body.StartLocation = methodDeclaration.EndLocation;
 				methodDeclaration.Body.EndLocation   = t.EndLocation;
 				
@@ -1891,7 +1897,7 @@ out stmt);
 		case 78: {
 			lexer.NextToken();
 
-#line  1119 "VBNET.ATG" 
+#line  1122 "VBNET.ATG" 
 			m.Check(Modifier.VBExternalMethods);
 			Point startPos = t.Location;
 			CharsetModifier charsetModifer = CharsetModifier.None;
@@ -1901,39 +1907,39 @@ out stmt);
 			
 			if (StartOf(14)) {
 				Charset(
-#line  1126 "VBNET.ATG" 
+#line  1129 "VBNET.ATG" 
 out charsetModifer);
 			}
 			if (la.kind == 167) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1129 "VBNET.ATG" 
+#line  1132 "VBNET.ATG" 
 				name = t.val; 
 				Expect(115);
 				Expect(3);
 
-#line  1130 "VBNET.ATG" 
+#line  1133 "VBNET.ATG" 
 				library = t.literalValue.ToString(); 
 				if (la.kind == 44) {
 					lexer.NextToken();
 					Expect(3);
 
-#line  1131 "VBNET.ATG" 
+#line  1134 "VBNET.ATG" 
 					alias = t.literalValue.ToString(); 
 				}
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  1132 "VBNET.ATG" 
+#line  1135 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
 				}
 				Expect(1);
 
-#line  1135 "VBNET.ATG" 
+#line  1138 "VBNET.ATG" 
 				DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer);
 				declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 				declareDeclaration.EndLocation   = t.EndLocation;
@@ -1943,25 +1949,25 @@ p);
 				lexer.NextToken();
 				Identifier();
 
-#line  1142 "VBNET.ATG" 
+#line  1145 "VBNET.ATG" 
 				name = t.val; 
 				Expect(115);
 				Expect(3);
 
-#line  1143 "VBNET.ATG" 
+#line  1146 "VBNET.ATG" 
 				library = t.literalValue.ToString(); 
 				if (la.kind == 44) {
 					lexer.NextToken();
 					Expect(3);
 
-#line  1144 "VBNET.ATG" 
+#line  1147 "VBNET.ATG" 
 					alias = t.literalValue.ToString(); 
 				}
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  1145 "VBNET.ATG" 
+#line  1148 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -1969,12 +1975,12 @@ p);
 				if (la.kind == 48) {
 					lexer.NextToken();
 					TypeName(
-#line  1146 "VBNET.ATG" 
+#line  1149 "VBNET.ATG" 
 out type);
 				}
 				Expect(1);
 
-#line  1149 "VBNET.ATG" 
+#line  1152 "VBNET.ATG" 
 				DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer);
 				declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 				declareDeclaration.EndLocation   = t.EndLocation;
@@ -1986,7 +1992,7 @@ out type);
 		case 93: {
 			lexer.NextToken();
 
-#line  1159 "VBNET.ATG" 
+#line  1162 "VBNET.ATG" 
 			m.Check(Modifier.VBEvents);
 			Point startPos = t.Location;
 			EventDeclaration eventDeclaration;
@@ -1995,19 +2001,19 @@ out type);
 			
 			Identifier();
 
-#line  1165 "VBNET.ATG" 
+#line  1168 "VBNET.ATG" 
 			name= t.val; 
 			if (la.kind == 48) {
 				lexer.NextToken();
 				TypeName(
-#line  1167 "VBNET.ATG" 
+#line  1170 "VBNET.ATG" 
 out type);
 			} else if (la.kind == 1 || la.kind == 24 || la.kind == 107) {
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  1169 "VBNET.ATG" 
+#line  1172 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -2015,11 +2021,11 @@ p);
 			} else SynErr(224);
 			if (la.kind == 107) {
 				ImplementsClause(
-#line  1171 "VBNET.ATG" 
+#line  1174 "VBNET.ATG" 
 out implementsClause);
 			}
 
-#line  1173 "VBNET.ATG" 
+#line  1176 "VBNET.ATG" 
 			eventDeclaration = new EventDeclaration(type, m.Modifier, p, attributes, name, implementsClause);
 			eventDeclaration.StartLocation = m.GetDeclarationLocation(startPos);
 			eventDeclaration.EndLocation = t.EndLocation;
@@ -2030,26 +2036,30 @@ out implementsClause);
 		}
 		case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: {
 
-#line  1180 "VBNET.ATG" 
+#line  1183 "VBNET.ATG" 
 			Point startPos = t.Location; 
 
-#line  1182 "VBNET.ATG" 
+#line  1185 "VBNET.ATG" 
 			m.Check(Modifier.Fields);
 			FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier);
 			fd.StartLocation = m.GetDeclarationLocation(startPos); 
 			
-			VariableDeclarator(
-#line  1186 "VBNET.ATG" 
-variableDeclarators);
+			IdentifierForFieldDeclaration();
+
+#line  1189 "VBNET.ATG" 
+			string name = t.val; 
+			VariableDeclaratorPartAfterIdentifier(
+#line  1190 "VBNET.ATG" 
+variableDeclarators, name);
 			while (la.kind == 12) {
 				lexer.NextToken();
 				VariableDeclarator(
-#line  1187 "VBNET.ATG" 
+#line  1191 "VBNET.ATG" 
 variableDeclarators);
 			}
 			Expect(1);
 
-#line  1190 "VBNET.ATG" 
+#line  1194 "VBNET.ATG" 
 			fd.EndLocation = t.EndLocation;
 			fd.Fields = variableDeclarators;
 			compilationUnit.AddChild(fd);
@@ -2058,35 +2068,35 @@ variableDeclarators);
 		}
 		case 71: {
 
-#line  1195 "VBNET.ATG" 
+#line  1199 "VBNET.ATG" 
 			m.Check(Modifier.Fields); 
 			lexer.NextToken();
 
-#line  1196 "VBNET.ATG" 
+#line  1200 "VBNET.ATG" 
 			m.Add(Modifier.Const, t.Location);  
 
-#line  1198 "VBNET.ATG" 
+#line  1202 "VBNET.ATG" 
 			FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier);
 			fd.StartLocation = m.GetDeclarationLocation(t.Location);
 			List<VariableDeclaration> constantDeclarators = new List<VariableDeclaration>();
 			
 			ConstantDeclarator(
-#line  1202 "VBNET.ATG" 
+#line  1206 "VBNET.ATG" 
 constantDeclarators);
 			while (la.kind == 12) {
 				lexer.NextToken();
 				ConstantDeclarator(
-#line  1203 "VBNET.ATG" 
+#line  1207 "VBNET.ATG" 
 constantDeclarators);
 			}
 
-#line  1205 "VBNET.ATG" 
+#line  1209 "VBNET.ATG" 
 			fd.Fields = constantDeclarators;
 			fd.EndLocation = t.Location;
 			
 			Expect(1);
 
-#line  1210 "VBNET.ATG" 
+#line  1214 "VBNET.ATG" 
 			fd.EndLocation = t.EndLocation;
 			compilationUnit.AddChild(fd);
 			
@@ -2095,20 +2105,20 @@ constantDeclarators);
 		case 146: {
 			lexer.NextToken();
 
-#line  1216 "VBNET.ATG" 
+#line  1220 "VBNET.ATG" 
 			m.Check(Modifier.VBProperties);
 			Point startPos = t.Location;
 			List<InterfaceImplementation> implementsClause = null;
 			
 			Identifier();
 
-#line  1220 "VBNET.ATG" 
+#line  1224 "VBNET.ATG" 
 			string propertyName = t.val; 
 			if (la.kind == 24) {
 				lexer.NextToken();
 				if (StartOf(4)) {
 					FormalParameterList(
-#line  1221 "VBNET.ATG" 
+#line  1225 "VBNET.ATG" 
 p);
 				}
 				Expect(25);
@@ -2116,26 +2126,26 @@ p);
 			if (la.kind == 48) {
 				lexer.NextToken();
 				TypeName(
-#line  1222 "VBNET.ATG" 
+#line  1226 "VBNET.ATG" 
 out type);
 			}
 
-#line  1224 "VBNET.ATG" 
+#line  1228 "VBNET.ATG" 
 			if(type == null) {
 			type = new TypeReference("System.Object");
 			}
 			
 			if (la.kind == 107) {
 				ImplementsClause(
-#line  1228 "VBNET.ATG" 
+#line  1232 "VBNET.ATG" 
 out implementsClause);
 			}
 			Expect(1);
 			if (
-#line  1232 "VBNET.ATG" 
+#line  1236 "VBNET.ATG" 
 IsMustOverride(m)) {
 
-#line  1234 "VBNET.ATG" 
+#line  1238 "VBNET.ATG" 
 				PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes);
 				pDecl.StartLocation = m.GetDeclarationLocation(startPos);
 				pDecl.EndLocation   = t.Location;
@@ -2146,7 +2156,7 @@ IsMustOverride(m)) {
 				
 			} else if (la.kind == 27 || la.kind == 101 || la.kind == 156) {
 
-#line  1244 "VBNET.ATG" 
+#line  1248 "VBNET.ATG" 
 				PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes);
 				pDecl.StartLocation = m.GetDeclarationLocation(startPos);
 				pDecl.EndLocation   = t.Location;
@@ -2158,13 +2168,13 @@ IsMustOverride(m)) {
 				PropertySetRegion setRegion;
 				
 				AccessorDecls(
-#line  1254 "VBNET.ATG" 
+#line  1258 "VBNET.ATG" 
 out getRegion, out setRegion);
 				Expect(88);
 				Expect(146);
 				Expect(1);
 
-#line  1258 "VBNET.ATG" 
+#line  1262 "VBNET.ATG" 
 				pDecl.GetRegion = getRegion;
 				pDecl.SetRegion = setRegion;
 				pDecl.BodyEnd = t.EndLocation;
@@ -2176,11 +2186,11 @@ out getRegion, out setRegion);
 		case 204: {
 			lexer.NextToken();
 
-#line  1265 "VBNET.ATG" 
+#line  1269 "VBNET.ATG" 
 			Point startPos = t.Location; 
 			Expect(93);
 
-#line  1267 "VBNET.ATG" 
+#line  1271 "VBNET.ATG" 
 			m.Check(Modifier.VBCustomEvents);
 			EventAddRemoveRegion eventAccessorDeclaration;
 			EventAddRegion addHandlerAccessorDeclaration = null;
@@ -2190,24 +2200,24 @@ out getRegion, out setRegion);
 			
 			Identifier();
 
-#line  1274 "VBNET.ATG" 
+#line  1278 "VBNET.ATG" 
 			string customEventName = t.val; 
 			Expect(48);
 			TypeName(
-#line  1275 "VBNET.ATG" 
+#line  1279 "VBNET.ATG" 
 out type);
 			if (la.kind == 107) {
 				ImplementsClause(
-#line  1276 "VBNET.ATG" 
+#line  1280 "VBNET.ATG" 
 out implementsClause);
 			}
 			Expect(1);
 			while (StartOf(15)) {
 				EventAccessorDeclaration(
-#line  1279 "VBNET.ATG" 
+#line  1283 "VBNET.ATG" 
 out eventAccessorDeclaration);
 
-#line  1281 "VBNET.ATG" 
+#line  1285 "VBNET.ATG" 
 				if(eventAccessorDeclaration is EventAddRegion)
 				{
 					addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration;
@@ -2226,7 +2236,7 @@ out eventAccessorDeclaration);
 			Expect(93);
 			Expect(1);
 
-#line  1297 "VBNET.ATG" 
+#line  1301 "VBNET.ATG" 
 			if(addHandlerAccessorDeclaration == null)
 			{
 				Error("Need to provide AddHandler accessor.");
@@ -2254,24 +2264,24 @@ out eventAccessorDeclaration);
 		}
 		case 187: case 201: case 202: {
 
-#line  1320 "VBNET.ATG" 
+#line  1324 "VBNET.ATG" 
 			ConversionType opConversionType = ConversionType.None; 
 			if (la.kind == 201 || la.kind == 202) {
 				if (la.kind == 202) {
 					lexer.NextToken();
 
-#line  1321 "VBNET.ATG" 
+#line  1325 "VBNET.ATG" 
 					opConversionType = ConversionType.Implicit; 
 				} else {
 					lexer.NextToken();
 
-#line  1322 "VBNET.ATG" 
+#line  1326 "VBNET.ATG" 
 					opConversionType = ConversionType.Explicit;
 				}
 			}
 			Expect(187);
 
-#line  1325 "VBNET.ATG" 
+#line  1329 "VBNET.ATG" 
 			m.Check(Modifier.VBOperators);
 			Point startPos = t.Location;
 			TypeReference returnType = NullTypeReference.Instance;
@@ -2283,7 +2293,7 @@ out eventAccessorDeclaration);
 			List<AttributeSection> returnTypeAttributes = new List<AttributeSection>();
 			
 			OverloadableOperator(
-#line  1335 "VBNET.ATG" 
+#line  1339 "VBNET.ATG" 
 out operatorType);
 			Expect(24);
 			if (la.kind == 55) {
@@ -2291,16 +2301,16 @@ out operatorType);
 			}
 			Identifier();
 
-#line  1336 "VBNET.ATG" 
+#line  1340 "VBNET.ATG" 
 			operandName = t.val; 
 			if (la.kind == 48) {
 				lexer.NextToken();
 				TypeName(
-#line  1337 "VBNET.ATG" 
+#line  1341 "VBNET.ATG" 
 out operandType);
 			}
 
-#line  1338 "VBNET.ATG" 
+#line  1342 "VBNET.ATG" 
 			parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); 
 			while (la.kind == 12) {
 				lexer.NextToken();
@@ -2309,48 +2319,48 @@ out operandType);
 				}
 				Identifier();
 
-#line  1342 "VBNET.ATG" 
+#line  1346 "VBNET.ATG" 
 				operandName = t.val; 
 				if (la.kind == 48) {
 					lexer.NextToken();
 					TypeName(
-#line  1343 "VBNET.ATG" 
+#line  1347 "VBNET.ATG" 
 out operandType);
 				}
 
-#line  1344 "VBNET.ATG" 
+#line  1348 "VBNET.ATG" 
 				parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); 
 			}
 			Expect(25);
 
-#line  1347 "VBNET.ATG" 
+#line  1351 "VBNET.ATG" 
 			Point endPos = t.EndLocation; 
 			if (la.kind == 48) {
 				lexer.NextToken();
 				while (la.kind == 27) {
 					AttributeSection(
-#line  1348 "VBNET.ATG" 
+#line  1352 "VBNET.ATG" 
 out section);
 
-#line  1348 "VBNET.ATG" 
+#line  1352 "VBNET.ATG" 
 					returnTypeAttributes.Add(section); 
 				}
 				TypeName(
-#line  1348 "VBNET.ATG" 
+#line  1352 "VBNET.ATG" 
 out returnType);
 
-#line  1348 "VBNET.ATG" 
+#line  1352 "VBNET.ATG" 
 				endPos = t.EndLocation; 
 				Expect(1);
 			}
 			Block(
-#line  1349 "VBNET.ATG" 
+#line  1353 "VBNET.ATG" 
 out stmt);
 			Expect(88);
 			Expect(187);
 			Expect(1);
 
-#line  1351 "VBNET.ATG" 
+#line  1355 "VBNET.ATG" 
 			OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, 
 			                                                                 attributes, 
 			                                                                 parameters, 
@@ -2373,25 +2383,25 @@ out stmt);
 	}
 
 	void EnumMemberDecl(
-#line  921 "VBNET.ATG" 
+#line  923 "VBNET.ATG" 
 out FieldDeclaration f) {
 
-#line  923 "VBNET.ATG" 
+#line  925 "VBNET.ATG" 
 		Expression expr = null;List<AttributeSection> attributes = new List<AttributeSection>();
 		AttributeSection section = null;
 		VariableDeclaration varDecl = null;
 		
 		while (la.kind == 27) {
 			AttributeSection(
-#line  927 "VBNET.ATG" 
+#line  929 "VBNET.ATG" 
 out section);
 
-#line  927 "VBNET.ATG" 
+#line  929 "VBNET.ATG" 
 			attributes.Add(section); 
 		}
 		Identifier();
 
-#line  930 "VBNET.ATG" 
+#line  932 "VBNET.ATG" 
 		f = new FieldDeclaration(attributes);
 		varDecl = new VariableDeclaration(t.val);
 		f.Fields.Add(varDecl);
@@ -2400,10 +2410,10 @@ out section);
 		if (la.kind == 11) {
 			lexer.NextToken();
 			Expr(
-#line  935 "VBNET.ATG" 
+#line  937 "VBNET.ATG" 
 out expr);
 
-#line  935 "VBNET.ATG" 
+#line  937 "VBNET.ATG" 
 			varDecl.Initializer = expr; 
 		}
 		Expect(1);
@@ -2411,7 +2421,7 @@ out expr);
 
 	void InterfaceMemberDecl() {
 
-#line  838 "VBNET.ATG" 
+#line  840 "VBNET.ATG" 
 		TypeReference type =null;
 		List<ParameterDeclarationExpression> p = new List<ParameterDeclarationExpression>();
 		List<TemplateDefinition> templates = new List<TemplateDefinition>();
@@ -2423,31 +2433,31 @@ out expr);
 		if (StartOf(16)) {
 			while (la.kind == 27) {
 				AttributeSection(
-#line  846 "VBNET.ATG" 
+#line  848 "VBNET.ATG" 
 out section);
 
-#line  846 "VBNET.ATG" 
+#line  848 "VBNET.ATG" 
 				attributes.Add(section); 
 			}
 			while (StartOf(7)) {
 				MemberModifier(
-#line  849 "VBNET.ATG" 
+#line  851 "VBNET.ATG" 
 mod);
 			}
 			if (la.kind == 93) {
 				lexer.NextToken();
 
-#line  852 "VBNET.ATG" 
+#line  854 "VBNET.ATG" 
 				mod.Check(Modifier.VBInterfaceEvents); 
 				Identifier();
 
-#line  853 "VBNET.ATG" 
+#line  855 "VBNET.ATG" 
 				name = t.val; 
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  854 "VBNET.ATG" 
+#line  856 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -2455,12 +2465,12 @@ p);
 				if (la.kind == 48) {
 					lexer.NextToken();
 					TypeName(
-#line  855 "VBNET.ATG" 
+#line  857 "VBNET.ATG" 
 out type);
 				}
 				Expect(1);
 
-#line  858 "VBNET.ATG" 
+#line  860 "VBNET.ATG" 
 				EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null);
 				compilationUnit.AddChild(ed);
 				ed.EndLocation = t.EndLocation;
@@ -2468,27 +2478,27 @@ out type);
 			} else if (la.kind == 167) {
 				lexer.NextToken();
 
-#line  864 "VBNET.ATG" 
+#line  866 "VBNET.ATG" 
 				mod.Check(Modifier.VBInterfaceMethods); 
 				Identifier();
 
-#line  865 "VBNET.ATG" 
+#line  867 "VBNET.ATG" 
 				name = t.val; 
 				TypeParameterList(
-#line  866 "VBNET.ATG" 
+#line  868 "VBNET.ATG" 
 templates);
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  867 "VBNET.ATG" 
+#line  869 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
 				}
 				Expect(1);
 
-#line  870 "VBNET.ATG" 
+#line  872 "VBNET.ATG" 
 				MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes);
 				md.TypeReference = new TypeReference("", "System.Void");
 				md.EndLocation = t.EndLocation;
@@ -2498,20 +2508,20 @@ p);
 			} else if (la.kind == 100) {
 				lexer.NextToken();
 
-#line  878 "VBNET.ATG" 
+#line  880 "VBNET.ATG" 
 				mod.Check(Modifier.VBInterfaceMethods); 
 				Identifier();
 
-#line  879 "VBNET.ATG" 
+#line  881 "VBNET.ATG" 
 				name = t.val; 
 				TypeParameterList(
-#line  880 "VBNET.ATG" 
+#line  882 "VBNET.ATG" 
 templates);
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  881 "VBNET.ATG" 
+#line  883 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -2520,15 +2530,15 @@ p);
 					lexer.NextToken();
 					while (la.kind == 27) {
 						AttributeSection(
-#line  882 "VBNET.ATG" 
+#line  884 "VBNET.ATG" 
 out returnTypeAttributeSection);
 					}
 					TypeName(
-#line  882 "VBNET.ATG" 
+#line  884 "VBNET.ATG" 
 out type);
 				}
 
-#line  884 "VBNET.ATG" 
+#line  886 "VBNET.ATG" 
 				if(type == null) {
 				type = new TypeReference("System.Object");
 				}
@@ -2545,17 +2555,17 @@ out type);
 			} else if (la.kind == 146) {
 				lexer.NextToken();
 
-#line  899 "VBNET.ATG" 
+#line  901 "VBNET.ATG" 
 				mod.Check(Modifier.VBInterfaceProperties); 
 				Identifier();
 
-#line  900 "VBNET.ATG" 
+#line  902 "VBNET.ATG" 
 				name = t.val;  
 				if (la.kind == 24) {
 					lexer.NextToken();
 					if (StartOf(4)) {
 						FormalParameterList(
-#line  901 "VBNET.ATG" 
+#line  903 "VBNET.ATG" 
 p);
 					}
 					Expect(25);
@@ -2563,18 +2573,18 @@ p);
 				if (la.kind == 48) {
 					lexer.NextToken();
 					TypeName(
-#line  902 "VBNET.ATG" 
+#line  904 "VBNET.ATG" 
 out type);
 				}
 
-#line  904 "VBNET.ATG" 
+#line  906 "VBNET.ATG" 
 				if(type == null) {
 				type = new TypeReference("System.Object");
 				}
 				
 				Expect(1);
 
-#line  910 "VBNET.ATG" 
+#line  912 "VBNET.ATG" 
 				PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes);
 				pd.Parameters = p;
 				pd.EndLocation = t.EndLocation;
@@ -2583,97 +2593,97 @@ out type);
 			} else SynErr(227);
 		} else if (StartOf(17)) {
 			NonModuleDeclaration(
-#line  917 "VBNET.ATG" 
+#line  919 "VBNET.ATG" 
 mod, attributes);
 		} else SynErr(228);
 	}
 
 	void Expr(
-#line  1729 "VBNET.ATG" 
+#line  1738 "VBNET.ATG" 
 out Expression expr) {
 		DisjunctionExpr(
-#line  1731 "VBNET.ATG" 
+#line  1740 "VBNET.ATG" 
 out expr);
 	}
 
 	void ImplementsClause(
-#line  1700 "VBNET.ATG" 
+#line  1709 "VBNET.ATG" 
 out List<InterfaceImplementation> baseInterfaces) {
 
-#line  1702 "VBNET.ATG" 
+#line  1711 "VBNET.ATG" 
 		baseInterfaces = new List<InterfaceImplementation>();
 		TypeReference type = null;
 		string memberName = null;
 		
 		Expect(107);
 		NonArrayTypeName(
-#line  1707 "VBNET.ATG" 
+#line  1716 "VBNET.ATG" 
 out type, false);
 
-#line  1708 "VBNET.ATG" 
+#line  1717 "VBNET.ATG" 
 		if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); 
 
-#line  1709 "VBNET.ATG" 
+#line  1718 "VBNET.ATG" 
 		baseInterfaces.Add(new InterfaceImplementation(type, memberName)); 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			NonArrayTypeName(
-#line  1711 "VBNET.ATG" 
+#line  1720 "VBNET.ATG" 
 out type, false);
 
-#line  1712 "VBNET.ATG" 
+#line  1721 "VBNET.ATG" 
 			if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); 
 
-#line  1713 "VBNET.ATG" 
+#line  1722 "VBNET.ATG" 
 			baseInterfaces.Add(new InterfaceImplementation(type, memberName)); 
 		}
 	}
 
 	void HandlesClause(
-#line  1658 "VBNET.ATG" 
+#line  1667 "VBNET.ATG" 
 out List<string> handlesClause) {
 
-#line  1660 "VBNET.ATG" 
+#line  1669 "VBNET.ATG" 
 		handlesClause = new List<string>();
 		string name;
 		
 		Expect(105);
 		EventMemberSpecifier(
-#line  1663 "VBNET.ATG" 
+#line  1672 "VBNET.ATG" 
 out name);
 
-#line  1663 "VBNET.ATG" 
+#line  1672 "VBNET.ATG" 
 		handlesClause.Add(name); 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			EventMemberSpecifier(
-#line  1664 "VBNET.ATG" 
+#line  1673 "VBNET.ATG" 
 out name);
 
-#line  1664 "VBNET.ATG" 
+#line  1673 "VBNET.ATG" 
 			handlesClause.Add(name); 
 		}
 	}
 
 	void Block(
-#line  2343 "VBNET.ATG" 
+#line  2353 "VBNET.ATG" 
 out Statement stmt) {
 
-#line  2346 "VBNET.ATG" 
+#line  2356 "VBNET.ATG" 
 		BlockStatement blockStmt = new BlockStatement();
 		blockStmt.StartLocation = t.Location;
 		compilationUnit.BlockStart(blockStmt);
 		
 		while (StartOf(18) || 
-#line  2351 "VBNET.ATG" 
+#line  2361 "VBNET.ATG" 
 IsEndStmtAhead()) {
 			if (
-#line  2351 "VBNET.ATG" 
+#line  2361 "VBNET.ATG" 
 IsEndStmtAhead()) {
 				Expect(88);
 				EndOfStmt();
 
-#line  2351 "VBNET.ATG" 
+#line  2361 "VBNET.ATG" 
 				compilationUnit.AddChild(new EndStatement()); 
 			} else {
 				Statement();
@@ -2681,7 +2691,7 @@ IsEndStmtAhead()) {
 			}
 		}
 
-#line  2356 "VBNET.ATG" 
+#line  2366 "VBNET.ATG" 
 		stmt = blockStmt;
 		blockStmt.EndLocation = t.EndLocation;
 		compilationUnit.BlockEnd();
@@ -2689,67 +2699,109 @@ IsEndStmtAhead()) {
 	}
 
 	void Charset(
-#line  1650 "VBNET.ATG" 
+#line  1659 "VBNET.ATG" 
 out CharsetModifier charsetModifier) {
 
-#line  1651 "VBNET.ATG" 
+#line  1660 "VBNET.ATG" 
 		charsetModifier = CharsetModifier.None; 
 		if (la.kind == 100 || la.kind == 167) {
 		} else if (la.kind == 47) {
 			lexer.NextToken();
 
-#line  1652 "VBNET.ATG" 
+#line  1661 "VBNET.ATG" 
 			charsetModifier = CharsetModifier.ANSI; 
 		} else if (la.kind == 50) {
 			lexer.NextToken();
 
-#line  1653 "VBNET.ATG" 
+#line  1662 "VBNET.ATG" 
 			charsetModifier = CharsetModifier.Auto; 
 		} else if (la.kind == 176) {
 			lexer.NextToken();
 
-#line  1654 "VBNET.ATG" 
+#line  1663 "VBNET.ATG" 
 			charsetModifier = CharsetModifier.Unicode; 
 		} else SynErr(229);
 	}
 
-	void VariableDeclarator(
-#line  1538 "VBNET.ATG" 
-List<VariableDeclaration> fieldDeclaration) {
+	void IdentifierForFieldDeclaration() {
+		switch (la.kind) {
+		case 2: {
+			lexer.NextToken();
+			break;
+		}
+		case 169: {
+			lexer.NextToken();
+			break;
+		}
+		case 51: {
+			lexer.NextToken();
+			break;
+		}
+		case 70: {
+			lexer.NextToken();
+			break;
+		}
+		case 49: {
+			lexer.NextToken();
+			break;
+		}
+		case 47: {
+			lexer.NextToken();
+			break;
+		}
+		case 50: {
+			lexer.NextToken();
+			break;
+		}
+		case 144: {
+			lexer.NextToken();
+			break;
+		}
+		case 176: {
+			lexer.NextToken();
+			break;
+		}
+		case 177: {
+			lexer.NextToken();
+			break;
+		}
+		default: SynErr(230); break;
+		}
+	}
+
+	void VariableDeclaratorPartAfterIdentifier(
+#line  1548 "VBNET.ATG" 
+List<VariableDeclaration> fieldDeclaration, string name) {
 
-#line  1540 "VBNET.ATG" 
+#line  1550 "VBNET.ATG" 
 		Expression expr = null;
 		TypeReference type = null;
 		ArrayList rank = null;
 		List<Expression> dimension = null;
 		
-		Identifier();
-
-#line  1545 "VBNET.ATG" 
-		string name = t.val; 
 		if (
-#line  1546 "VBNET.ATG" 
+#line  1555 "VBNET.ATG" 
 IsSize() && !IsDims()) {
 			ArrayInitializationModifier(
-#line  1546 "VBNET.ATG" 
+#line  1555 "VBNET.ATG" 
 out dimension);
 		}
 		if (
-#line  1547 "VBNET.ATG" 
+#line  1556 "VBNET.ATG" 
 IsDims()) {
 			ArrayNameModifier(
-#line  1547 "VBNET.ATG" 
+#line  1556 "VBNET.ATG" 
 out rank);
 		}
 		if (
-#line  1549 "VBNET.ATG" 
+#line  1558 "VBNET.ATG" 
 IsObjectCreation()) {
 			Expect(48);
 			ObjectCreateExpression(
-#line  1549 "VBNET.ATG" 
+#line  1558 "VBNET.ATG" 
 out expr);
 
-#line  1551 "VBNET.ATG" 
+#line  1560 "VBNET.ATG" 
 			if (expr is ObjectCreateExpression) {
 			type = ((ObjectCreateExpression)expr).CreateType;
 			} else {
@@ -2760,11 +2812,11 @@ out expr);
 			if (la.kind == 48) {
 				lexer.NextToken();
 				TypeName(
-#line  1558 "VBNET.ATG" 
+#line  1567 "VBNET.ATG" 
 out type);
 			}
 
-#line  1560 "VBNET.ATG" 
+#line  1569 "VBNET.ATG" 
 			if (type != null && dimension != null) {
 			if(type.RankSpecifier != null) {
 				Error("array rank only allowed one time");
@@ -2790,40 +2842,52 @@ out type);
 			if (la.kind == 11) {
 				lexer.NextToken();
 				VariableInitializer(
-#line  1582 "VBNET.ATG" 
+#line  1591 "VBNET.ATG" 
 out expr);
 			}
-		} else SynErr(230);
+		} else SynErr(231);
 
-#line  1584 "VBNET.ATG" 
+#line  1593 "VBNET.ATG" 
 		fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); 
 	}
 
+	void VariableDeclarator(
+#line  1542 "VBNET.ATG" 
+List<VariableDeclaration> fieldDeclaration) {
+		Identifier();
+
+#line  1544 "VBNET.ATG" 
+		string name = t.val; 
+		VariableDeclaratorPartAfterIdentifier(
+#line  1545 "VBNET.ATG" 
+fieldDeclaration, name);
+	}
+
 	void ConstantDeclarator(
-#line  1521 "VBNET.ATG" 
+#line  1525 "VBNET.ATG" 
 List<VariableDeclaration> constantDeclaration) {
 
-#line  1523 "VBNET.ATG" 
+#line  1527 "VBNET.ATG" 
 		Expression expr = null;
 		TypeReference type = null;
 		string name = String.Empty;
 		
 		Identifier();
 
-#line  1527 "VBNET.ATG" 
+#line  1531 "VBNET.ATG" 
 		name = t.val; 
 		if (la.kind == 48) {
 			lexer.NextToken();
 			TypeName(
-#line  1528 "VBNET.ATG" 
+#line  1532 "VBNET.ATG" 
 out type);
 		}
 		Expect(11);
 		Expr(
-#line  1529 "VBNET.ATG" 
+#line  1533 "VBNET.ATG" 
 out expr);
 
-#line  1531 "VBNET.ATG" 
+#line  1535 "VBNET.ATG" 
 		VariableDeclaration f = new VariableDeclaration(name, expr);
 		f.TypeReference = type;
 		constantDeclaration.Add(f);
@@ -2831,10 +2895,10 @@ out expr);
 	}
 
 	void AccessorDecls(
-#line  1463 "VBNET.ATG" 
+#line  1467 "VBNET.ATG" 
 out PropertyGetRegion getBlock, out PropertySetRegion setBlock) {
 
-#line  1465 "VBNET.ATG" 
+#line  1469 "VBNET.ATG" 
 		List<AttributeSection> attributes = new List<AttributeSection>();
 		AttributeSection section;
 		getBlock = null;
@@ -2842,60 +2906,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) {
 		
 		while (la.kind == 27) {
 			AttributeSection(
-#line  1470 "VBNET.ATG" 
+#line  1474 "VBNET.ATG" 
 out section);
 
-#line  1470 "VBNET.ATG" 
+#line  1474 "VBNET.ATG" 
 			attributes.Add(section); 
 		}
 		if (la.kind == 101) {
 			GetAccessorDecl(
-#line  1472 "VBNET.ATG" 
+#line  1476 "VBNET.ATG" 
 out getBlock, attributes);
 			if (la.kind == 27 || la.kind == 156) {
 
-#line  1474 "VBNET.ATG" 
+#line  1478 "VBNET.ATG" 
 				attributes = new List<AttributeSection>(); 
 				while (la.kind == 27) {
 					AttributeSection(
-#line  1475 "VBNET.ATG" 
+#line  1479 "VBNET.ATG" 
 out section);
 
-#line  1475 "VBNET.ATG" 
+#line  1479 "VBNET.ATG" 
 					attributes.Add(section); 
 				}
 				SetAccessorDecl(
-#line  1476 "VBNET.ATG" 
+#line  1480 "VBNET.ATG" 
 out setBlock, attributes);
 			}
 		} else if (la.kind == 156) {
 			SetAccessorDecl(
-#line  1479 "VBNET.ATG" 
+#line  1483 "VBNET.ATG" 
 out setBlock, attributes);
 			if (la.kind == 27 || la.kind == 101) {
 
-#line  1481 "VBNET.ATG" 
+#line  1485 "VBNET.ATG" 
 				attributes = new List<AttributeSection>(); 
 				while (la.kind == 27) {
 					AttributeSection(
-#line  1482 "VBNET.ATG" 
+#line  1486 "VBNET.ATG" 
 out section);
 
-#line  1482 "VBNET.ATG" 
+#line  1486 "VBNET.ATG" 
 					attributes.Add(section); 
 				}
 				GetAccessorDecl(
-#line  1483 "VBNET.ATG" 
+#line  1487 "VBNET.ATG" 
 out getBlock, attributes);
 			}
-		} else SynErr(231);
+		} else SynErr(232);
 	}
 
 	void EventAccessorDeclaration(
-#line  1426 "VBNET.ATG" 
+#line  1430 "VBNET.ATG" 
 out EventAddRemoveRegion eventAccessorDeclaration) {
 
-#line  1428 "VBNET.ATG" 
+#line  1432 "VBNET.ATG" 
 		Statement stmt = null;
 		List<ParameterDeclarationExpression> p = new List<ParameterDeclarationExpression>();
 		AttributeSection section;
@@ -2904,10 +2968,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) {
 		
 		while (la.kind == 27) {
 			AttributeSection(
-#line  1434 "VBNET.ATG" 
+#line  1438 "VBNET.ATG" 
 out section);
 
-#line  1434 "VBNET.ATG" 
+#line  1438 "VBNET.ATG" 
 			attributes.Add(section); 
 		}
 		if (la.kind == 42) {
@@ -2916,20 +2980,20 @@ out section);
 				lexer.NextToken();
 				if (StartOf(4)) {
 					FormalParameterList(
-#line  1436 "VBNET.ATG" 
+#line  1440 "VBNET.ATG" 
 p);
 				}
 				Expect(25);
 			}
 			Expect(1);
 			Block(
-#line  1437 "VBNET.ATG" 
+#line  1441 "VBNET.ATG" 
 out stmt);
 			Expect(88);
 			Expect(42);
 			Expect(1);
 
-#line  1439 "VBNET.ATG" 
+#line  1443 "VBNET.ATG" 
 			eventAccessorDeclaration = new EventAddRegion(attributes);
 			eventAccessorDeclaration.Block = (BlockStatement)stmt;
 			eventAccessorDeclaration.Parameters = p;
@@ -2940,20 +3004,20 @@ out stmt);
 				lexer.NextToken();
 				if (StartOf(4)) {
 					FormalParameterList(
-#line  1444 "VBNET.ATG" 
+#line  1448 "VBNET.ATG" 
 p);
 				}
 				Expect(25);
 			}
 			Expect(1);
 			Block(
-#line  1445 "VBNET.ATG" 
+#line  1449 "VBNET.ATG" 
 out stmt);
 			Expect(88);
 			Expect(152);
 			Expect(1);
 
-#line  1447 "VBNET.ATG" 
+#line  1451 "VBNET.ATG" 
 			eventAccessorDeclaration = new EventRemoveRegion(attributes);
 			eventAccessorDeclaration.Block = (BlockStatement)stmt;
 			eventAccessorDeclaration.Parameters = p;
@@ -2964,185 +3028,185 @@ out stmt);
 				lexer.NextToken();
 				if (StartOf(4)) {
 					FormalParameterList(
-#line  1452 "VBNET.ATG" 
+#line  1456 "VBNET.ATG" 
 p);
 				}
 				Expect(25);
 			}
 			Expect(1);
 			Block(
-#line  1453 "VBNET.ATG" 
+#line  1457 "VBNET.ATG" 
 out stmt);
 			Expect(88);
 			Expect(149);
 			Expect(1);
 
-#line  1455 "VBNET.ATG" 
+#line  1459 "VBNET.ATG" 
 			eventAccessorDeclaration = new EventRaiseRegion(attributes);
 			eventAccessorDeclaration.Block = (BlockStatement)stmt;
 			eventAccessorDeclaration.Parameters = p;
 			
-		} else SynErr(232);
+		} else SynErr(233);
 	}
 
 	void OverloadableOperator(
-#line  1368 "VBNET.ATG" 
+#line  1372 "VBNET.ATG" 
 out OverloadableOperatorType operatorType) {
 
-#line  1369 "VBNET.ATG" 
+#line  1373 "VBNET.ATG" 
 		operatorType = OverloadableOperatorType.None; 
 		switch (la.kind) {
 		case 14: {
 			lexer.NextToken();
 
-#line  1371 "VBNET.ATG" 
+#line  1375 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Add; 
 			break;
 		}
 		case 15: {
 			lexer.NextToken();
 
-#line  1373 "VBNET.ATG" 
+#line  1377 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Subtract; 
 			break;
 		}
 		case 16: {
 			lexer.NextToken();
 
-#line  1375 "VBNET.ATG" 
+#line  1379 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Multiply; 
 			break;
 		}
 		case 17: {
 			lexer.NextToken();
 
-#line  1377 "VBNET.ATG" 
+#line  1381 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Divide; 
 			break;
 		}
 		case 18: {
 			lexer.NextToken();
 
-#line  1379 "VBNET.ATG" 
+#line  1383 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.DivideInteger; 
 			break;
 		}
 		case 19: {
 			lexer.NextToken();
 
-#line  1381 "VBNET.ATG" 
+#line  1385 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Concat; 
 			break;
 		}
 		case 116: {
 			lexer.NextToken();
 
-#line  1383 "VBNET.ATG" 
+#line  1387 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Like; 
 			break;
 		}
 		case 120: {
 			lexer.NextToken();
 
-#line  1385 "VBNET.ATG" 
+#line  1389 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Modulus; 
 			break;
 		}
 		case 45: {
 			lexer.NextToken();
 
-#line  1387 "VBNET.ATG" 
+#line  1391 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.BitwiseAnd; 
 			break;
 		}
 		case 138: {
 			lexer.NextToken();
 
-#line  1389 "VBNET.ATG" 
+#line  1393 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.BitwiseOr; 
 			break;
 		}
 		case 185: {
 			lexer.NextToken();
 
-#line  1391 "VBNET.ATG" 
+#line  1395 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.ExclusiveOr; 
 			break;
 		}
 		case 20: {
 			lexer.NextToken();
 
-#line  1393 "VBNET.ATG" 
+#line  1397 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Power; 
 			break;
 		}
 		case 31: {
 			lexer.NextToken();
 
-#line  1395 "VBNET.ATG" 
+#line  1399 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.ShiftLeft; 
 			break;
 		}
 		case 32: {
 			lexer.NextToken();
 
-#line  1397 "VBNET.ATG" 
+#line  1401 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.ShiftRight; 
 			break;
 		}
 		case 11: {
 			lexer.NextToken();
 
-#line  1399 "VBNET.ATG" 
+#line  1403 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.Equality; 
 			break;
 		}
 		case 28: {
 			lexer.NextToken();
 
-#line  1401 "VBNET.ATG" 
+#line  1405 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.InEquality; 
 			break;
 		}
 		case 27: {
 			lexer.NextToken();
 
-#line  1403 "VBNET.ATG" 
+#line  1407 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.LessThan; 
 			break;
 		}
 		case 30: {
 			lexer.NextToken();
 
-#line  1405 "VBNET.ATG" 
+#line  1409 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.LessThanOrEqual; 
 			break;
 		}
 		case 26: {
 			lexer.NextToken();
 
-#line  1407 "VBNET.ATG" 
+#line  1411 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.GreaterThan; 
 			break;
 		}
 		case 29: {
 			lexer.NextToken();
 
-#line  1409 "VBNET.ATG" 
+#line  1413 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.GreaterThanOrEqual; 
 			break;
 		}
 		case 75: {
 			lexer.NextToken();
 
-#line  1411 "VBNET.ATG" 
+#line  1415 "VBNET.ATG" 
 			operatorType = OverloadableOperatorType.CType; 
 			break;
 		}
-		case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: {
+		case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: case 204: {
 			Identifier();
 
-#line  1415 "VBNET.ATG" 
+#line  1419 "VBNET.ATG" 
 			string opName = t.val; 
 			if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) {
 				operatorType = OverloadableOperatorType.IsTrue;
@@ -3154,103 +3218,103 @@ out OverloadableOperatorType operatorType) {
 			
 			break;
 		}
-		default: SynErr(233); break;
+		default: SynErr(234); break;
 		}
 	}
 
 	void GetAccessorDecl(
-#line  1489 "VBNET.ATG" 
+#line  1493 "VBNET.ATG" 
 out PropertyGetRegion getBlock, List<AttributeSection> attributes) {
 
-#line  1490 "VBNET.ATG" 
+#line  1494 "VBNET.ATG" 
 		Statement stmt = null; 
 		Expect(101);
 
-#line  1492 "VBNET.ATG" 
+#line  1496 "VBNET.ATG" 
 		Point startLocation = t.Location; 
 		Expect(1);
 		Block(
-#line  1494 "VBNET.ATG" 
+#line  1498 "VBNET.ATG" 
 out stmt);
 
-#line  1495 "VBNET.ATG" 
+#line  1499 "VBNET.ATG" 
 		getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); 
 		Expect(88);
 		Expect(101);
 
-#line  1497 "VBNET.ATG" 
+#line  1501 "VBNET.ATG" 
 		getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void SetAccessorDecl(
-#line  1502 "VBNET.ATG" 
+#line  1506 "VBNET.ATG" 
 out PropertySetRegion setBlock, List<AttributeSection> attributes) {
 
-#line  1504 "VBNET.ATG" 
+#line  1508 "VBNET.ATG" 
 		Statement stmt = null; List<ParameterDeclarationExpression> p = new List<ParameterDeclarationExpression>();
 		
 		Expect(156);
 
-#line  1507 "VBNET.ATG" 
+#line  1511 "VBNET.ATG" 
 		Point startLocation = t.Location; 
 		if (la.kind == 24) {
 			lexer.NextToken();
 			if (StartOf(4)) {
 				FormalParameterList(
-#line  1508 "VBNET.ATG" 
+#line  1512 "VBNET.ATG" 
 p);
 			}
 			Expect(25);
 		}
 		Expect(1);
 		Block(
-#line  1510 "VBNET.ATG" 
+#line  1514 "VBNET.ATG" 
 out stmt);
 
-#line  1512 "VBNET.ATG" 
+#line  1516 "VBNET.ATG" 
 		setBlock = new PropertySetRegion((BlockStatement)stmt, attributes);
 		setBlock.Parameters = p;
 		
 		Expect(88);
 		Expect(156);
 
-#line  1516 "VBNET.ATG" 
+#line  1520 "VBNET.ATG" 
 		setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; 
 		Expect(1);
 	}
 
 	void ArrayInitializationModifier(
-#line  1588 "VBNET.ATG" 
+#line  1597 "VBNET.ATG" 
 out List<Expression> arrayModifiers) {
 
-#line  1590 "VBNET.ATG" 
+#line  1599 "VBNET.ATG" 
 		arrayModifiers = null;
 		
 		Expect(24);
 		InitializationRankList(
-#line  1592 "VBNET.ATG" 
+#line  1601 "VBNET.ATG" 
 out arrayModifiers);
 		Expect(25);
 	}
 
 	void ArrayNameModifier(
-#line  2136 "VBNET.ATG" 
+#line  2146 "VBNET.ATG" 
 out ArrayList arrayModifiers) {
 
-#line  2138 "VBNET.ATG" 
+#line  2148 "VBNET.ATG" 
 		arrayModifiers = null;
 		
 		ArrayTypeModifiers(
-#line  2140 "VBNET.ATG" 
+#line  2150 "VBNET.ATG" 
 out arrayModifiers);
 	}
 
 	void ObjectCreateExpression(
-#line  2018 "VBNET.ATG" 
+#line  2027 "VBNET.ATG" 
 out Expression oce) {
 
-#line  2020 "VBNET.ATG" 
+#line  2029 "VBNET.ATG" 
 		TypeReference type = null;
 		Expression initializer = null;
 		List<Expression> arguments = null;
@@ -3259,39 +3323,38 @@ out Expression oce) {
 		
 		Expect(127);
 		NonArrayTypeName(
-#line  2026 "VBNET.ATG" 
+#line  2035 "VBNET.ATG" 
 out type, false);
 		if (la.kind == 24) {
 			lexer.NextToken();
-			if (StartOf(20)) {
-				ArgumentList(
-#line  2027 "VBNET.ATG" 
+			ArgumentList(
+#line  2036 "VBNET.ATG" 
 out arguments);
-			}
 			Expect(25);
-		}
-		if (la.kind == 22 || 
-#line  2028 "VBNET.ATG" 
+			if (la.kind == 22 || 
+#line  2037 "VBNET.ATG" 
 la.kind == Tokens.OpenParenthesis) {
-			if (
-#line  2028 "VBNET.ATG" 
+				if (
+#line  2037 "VBNET.ATG" 
 la.kind == Tokens.OpenParenthesis) {
-				ArrayTypeModifiers(
-#line  2029 "VBNET.ATG" 
+					ArrayTypeModifiers(
+#line  2038 "VBNET.ATG" 
 out dimensions);
-				ArrayInitializer(
-#line  2030 "VBNET.ATG" 
+					ArrayInitializer(
+#line  2039 "VBNET.ATG" 
 out initializer);
-			} else {
-				ArrayInitializer(
-#line  2031 "VBNET.ATG" 
+				} else {
+					ArrayInitializer(
+#line  2040 "VBNET.ATG" 
 out initializer);
+				}
 			}
 		}
 
-#line  2033 "VBNET.ATG" 
+#line  2043 "VBNET.ATG" 
+		if (type == null) type = new TypeReference("Object"); // fallback type on parser errors
 		if (initializer == null) {
-		oce = new ObjectCreateExpression(type, arguments);
+			oce = new ObjectCreateExpression(type, arguments);
 		} else {
 			if (dimensions == null) dimensions = new ArrayList();
 			dimensions.Insert(0, (arguments == null) ? 0 : Math.Max(arguments.Count - 1, 0));
@@ -3304,120 +3367,120 @@ out initializer);
 	}
 
 	void VariableInitializer(
-#line  1622 "VBNET.ATG" 
+#line  1631 "VBNET.ATG" 
 out Expression initializerExpression) {
 
-#line  1624 "VBNET.ATG" 
+#line  1633 "VBNET.ATG" 
 		initializerExpression = null;
 		
-		if (StartOf(21)) {
+		if (StartOf(20)) {
 			Expr(
-#line  1626 "VBNET.ATG" 
+#line  1635 "VBNET.ATG" 
 out initializerExpression);
 		} else if (la.kind == 22) {
 			ArrayInitializer(
-#line  1627 "VBNET.ATG" 
+#line  1636 "VBNET.ATG" 
 out initializerExpression);
-		} else SynErr(234);
+		} else SynErr(235);
 	}
 
 	void InitializationRankList(
-#line  1596 "VBNET.ATG" 
+#line  1605 "VBNET.ATG" 
 out List<Expression> rank) {
 
-#line  1598 "VBNET.ATG" 
+#line  1607 "VBNET.ATG" 
 		rank = new List<Expression>();
 		Expression expr = null;
 		
 		Expr(
-#line  1601 "VBNET.ATG" 
+#line  1610 "VBNET.ATG" 
 out expr);
 		if (la.kind == 172) {
 			lexer.NextToken();
 
-#line  1603 "VBNET.ATG" 
+#line  1612 "VBNET.ATG" 
 			if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0")
 			Error("lower bound of array must be zero");
 			
 			Expr(
-#line  1606 "VBNET.ATG" 
+#line  1615 "VBNET.ATG" 
 out expr);
 		}
 
-#line  1608 "VBNET.ATG" 
+#line  1617 "VBNET.ATG" 
 		if (expr != null) { rank.Add(expr); } 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			Expr(
-#line  1610 "VBNET.ATG" 
+#line  1619 "VBNET.ATG" 
 out expr);
 			if (la.kind == 172) {
 				lexer.NextToken();
 
-#line  1612 "VBNET.ATG" 
+#line  1621 "VBNET.ATG" 
 				if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0")
 				Error("lower bound of array must be zero");
 				
 				Expr(
-#line  1615 "VBNET.ATG" 
+#line  1624 "VBNET.ATG" 
 out expr);
 			}
 
-#line  1617 "VBNET.ATG" 
+#line  1626 "VBNET.ATG" 
 			if (expr != null) { rank.Add(expr); } 
 		}
 	}
 
 	void ArrayInitializer(
-#line  1631 "VBNET.ATG" 
+#line  1640 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1633 "VBNET.ATG" 
+#line  1642 "VBNET.ATG" 
 		Expression expr = null;
 		ArrayInitializerExpression initializer = new ArrayInitializerExpression();
 		
 		Expect(22);
-		if (StartOf(22)) {
+		if (StartOf(21)) {
 			VariableInitializer(
-#line  1638 "VBNET.ATG" 
+#line  1647 "VBNET.ATG" 
 out expr);
 
-#line  1640 "VBNET.ATG" 
+#line  1649 "VBNET.ATG" 
 			if (expr != null) { initializer.CreateExpressions.Add(expr); }
 			
 			while (
-#line  1643 "VBNET.ATG" 
+#line  1652 "VBNET.ATG" 
 NotFinalComma()) {
 				Expect(12);
 				VariableInitializer(
-#line  1643 "VBNET.ATG" 
+#line  1652 "VBNET.ATG" 
 out expr);
 
-#line  1644 "VBNET.ATG" 
+#line  1653 "VBNET.ATG" 
 				if (expr != null) { initializer.CreateExpressions.Add(expr); } 
 			}
 		}
 		Expect(23);
 
-#line  1647 "VBNET.ATG" 
+#line  1656 "VBNET.ATG" 
 		outExpr = initializer; 
 	}
 
 	void EventMemberSpecifier(
-#line  1717 "VBNET.ATG" 
+#line  1726 "VBNET.ATG" 
 out string name) {
 
-#line  1718 "VBNET.ATG" 
+#line  1727 "VBNET.ATG" 
 		string type; name = String.Empty; 
 		if (StartOf(12)) {
 			Identifier();
 
-#line  1719 "VBNET.ATG" 
+#line  1728 "VBNET.ATG" 
 			type = t.val; 
 			Expect(10);
 			Identifier();
 
-#line  1721 "VBNET.ATG" 
+#line  1730 "VBNET.ATG" 
 			name = type + "." + t.val; 
 		} else if (la.kind == 124) {
 			lexer.NextToken();
@@ -3425,280 +3488,289 @@ out string name) {
 			if (StartOf(12)) {
 				Identifier();
 
-#line  1724 "VBNET.ATG" 
+#line  1733 "VBNET.ATG" 
 				name = "MyBase." + t.val; 
 			} else if (la.kind == 92) {
 				lexer.NextToken();
 
-#line  1725 "VBNET.ATG" 
+#line  1734 "VBNET.ATG" 
 				name = "MyBase.Error"; 
-			} else SynErr(235);
-		} else SynErr(236);
+			} else SynErr(236);
+		} else SynErr(237);
 	}
 
 	void DisjunctionExpr(
-#line  1867 "VBNET.ATG" 
+#line  1876 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1869 "VBNET.ATG" 
+#line  1878 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ConjunctionExpr(
-#line  1872 "VBNET.ATG" 
+#line  1881 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 138 || la.kind == 139 || la.kind == 185) {
 			if (la.kind == 138) {
 				lexer.NextToken();
 
-#line  1875 "VBNET.ATG" 
+#line  1884 "VBNET.ATG" 
 				op = BinaryOperatorType.BitwiseOr; 
 			} else if (la.kind == 139) {
 				lexer.NextToken();
 
-#line  1876 "VBNET.ATG" 
+#line  1885 "VBNET.ATG" 
 				op = BinaryOperatorType.LogicalOr; 
 			} else {
 				lexer.NextToken();
 
-#line  1877 "VBNET.ATG" 
+#line  1886 "VBNET.ATG" 
 				op = BinaryOperatorType.ExclusiveOr; 
 			}
 			ConjunctionExpr(
-#line  1879 "VBNET.ATG" 
+#line  1888 "VBNET.ATG" 
 out expr);
 
-#line  1879 "VBNET.ATG" 
+#line  1888 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void AssignmentOperator(
-#line  1734 "VBNET.ATG" 
+#line  1743 "VBNET.ATG" 
 out AssignmentOperatorType op) {
 
-#line  1735 "VBNET.ATG" 
+#line  1744 "VBNET.ATG" 
 		op = AssignmentOperatorType.None; 
 		switch (la.kind) {
 		case 11: {
 			lexer.NextToken();
 
-#line  1736 "VBNET.ATG" 
+#line  1745 "VBNET.ATG" 
 			op = AssignmentOperatorType.Assign; 
 			break;
 		}
 		case 41: {
 			lexer.NextToken();
 
-#line  1737 "VBNET.ATG" 
+#line  1746 "VBNET.ATG" 
 			op = AssignmentOperatorType.ConcatString; 
 			break;
 		}
 		case 33: {
 			lexer.NextToken();
 
-#line  1738 "VBNET.ATG" 
+#line  1747 "VBNET.ATG" 
 			op = AssignmentOperatorType.Add; 
 			break;
 		}
 		case 35: {
 			lexer.NextToken();
 
-#line  1739 "VBNET.ATG" 
+#line  1748 "VBNET.ATG" 
 			op = AssignmentOperatorType.Subtract; 
 			break;
 		}
 		case 36: {
 			lexer.NextToken();
 
-#line  1740 "VBNET.ATG" 
+#line  1749 "VBNET.ATG" 
 			op = AssignmentOperatorType.Multiply; 
 			break;
 		}
 		case 37: {
 			lexer.NextToken();
 
-#line  1741 "VBNET.ATG" 
+#line  1750 "VBNET.ATG" 
 			op = AssignmentOperatorType.Divide; 
 			break;
 		}
 		case 38: {
 			lexer.NextToken();
 
-#line  1742 "VBNET.ATG" 
+#line  1751 "VBNET.ATG" 
 			op = AssignmentOperatorType.DivideInteger; 
 			break;
 		}
 		case 34: {
 			lexer.NextToken();
 
-#line  1743 "VBNET.ATG" 
+#line  1752 "VBNET.ATG" 
 			op = AssignmentOperatorType.Power; 
 			break;
 		}
 		case 39: {
 			lexer.NextToken();
 
-#line  1744 "VBNET.ATG" 
+#line  1753 "VBNET.ATG" 
 			op = AssignmentOperatorType.ShiftLeft; 
 			break;
 		}
 		case 40: {
 			lexer.NextToken();
 
-#line  1745 "VBNET.ATG" 
+#line  1754 "VBNET.ATG" 
 			op = AssignmentOperatorType.ShiftRight; 
 			break;
 		}
-		default: SynErr(237); break;
+		default: SynErr(238); break;
 		}
 	}
 
 	void SimpleExpr(
-#line  1749 "VBNET.ATG" 
+#line  1758 "VBNET.ATG" 
 out Expression pexpr) {
 
-#line  1751 "VBNET.ATG" 
+#line  1760 "VBNET.ATG" 
 		Expression expr;
 		TypeReference type = null;
 		string name = String.Empty;
 		pexpr = null;
 		
-		if (StartOf(23)) {
+		if (StartOf(22)) {
 			switch (la.kind) {
 			case 3: {
 				lexer.NextToken();
 
-#line  1759 "VBNET.ATG" 
+#line  1768 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 4: {
 				lexer.NextToken();
 
-#line  1760 "VBNET.ATG" 
+#line  1769 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 7: {
 				lexer.NextToken();
 
-#line  1761 "VBNET.ATG" 
+#line  1770 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 6: {
 				lexer.NextToken();
 
-#line  1762 "VBNET.ATG" 
+#line  1771 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 5: {
 				lexer.NextToken();
 
-#line  1763 "VBNET.ATG" 
+#line  1772 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 9: {
 				lexer.NextToken();
 
-#line  1764 "VBNET.ATG" 
+#line  1773 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 8: {
 				lexer.NextToken();
 
-#line  1765 "VBNET.ATG" 
+#line  1774 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 				break;
 			}
 			case 173: {
 				lexer.NextToken();
 
-#line  1767 "VBNET.ATG" 
+#line  1776 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(true, "true");  
 				break;
 			}
 			case 96: {
 				lexer.NextToken();
 
-#line  1768 "VBNET.ATG" 
+#line  1777 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(false, "false"); 
 				break;
 			}
 			case 130: {
 				lexer.NextToken();
 
-#line  1769 "VBNET.ATG" 
+#line  1778 "VBNET.ATG" 
 				pexpr = new PrimitiveExpression(null, "null");  
 				break;
 			}
 			case 24: {
 				lexer.NextToken();
 				Expr(
-#line  1770 "VBNET.ATG" 
+#line  1779 "VBNET.ATG" 
 out expr);
 				Expect(25);
 
-#line  1770 "VBNET.ATG" 
+#line  1779 "VBNET.ATG" 
 				pexpr = new ParenthesizedExpression(expr); 
 				break;
 			}
-			case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: {
+			case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: case 204: {
 				Identifier();
 
-#line  1771 "VBNET.ATG" 
+#line  1780 "VBNET.ATG" 
 				pexpr = new IdentifierExpression(t.val); 
 				break;
 			}
-			case 52: case 54: case 65: case 76: case 77: case 84: case 111: case 117: case 159: case 160: case 165: case 190: case 191: case 192: case 193: {
+			case 10: case 52: case 54: case 65: case 76: case 77: case 84: case 111: case 117: case 133: case 159: case 160: case 165: case 190: case 191: case 192: case 193: {
 
-#line  1772 "VBNET.ATG" 
+#line  1781 "VBNET.ATG" 
 				string val = String.Empty; 
-				PrimitiveTypeName(
-#line  1773 "VBNET.ATG" 
+				if (StartOf(23)) {
+					if (StartOf(9)) {
+						PrimitiveTypeName(
+#line  1782 "VBNET.ATG" 
 out val);
+					} else {
+						lexer.NextToken();
+
+#line  1782 "VBNET.ATG" 
+						val = "Object"; 
+					}
+				}
 				Expect(10);
 
-#line  1774 "VBNET.ATG" 
+#line  1783 "VBNET.ATG" 
 				t.val = ""; 
 				Identifier();
 
-#line  1774 "VBNET.ATG" 
+#line  1783 "VBNET.ATG" 
 				pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); 
 				break;
 			}
 			case 119: {
 				lexer.NextToken();
 
-#line  1775 "VBNET.ATG" 
+#line  1784 "VBNET.ATG" 
 				pexpr = new ThisReferenceExpression(); 
 				break;
 			}
 			case 124: case 125: {
 
-#line  1776 "VBNET.ATG" 
+#line  1785 "VBNET.ATG" 
 				Expression retExpr = null; 
 				if (la.kind == 124) {
 					lexer.NextToken();
 
-#line  1777 "VBNET.ATG" 
+#line  1786 "VBNET.ATG" 
 					retExpr = new BaseReferenceExpression(); 
 				} else if (la.kind == 125) {
 					lexer.NextToken();
 
-#line  1778 "VBNET.ATG" 
+#line  1787 "VBNET.ATG" 
 					retExpr = new ClassReferenceExpression(); 
-				} else SynErr(238);
+				} else SynErr(239);
 				Expect(10);
 				IdentifierOrKeyword(
-#line  1780 "VBNET.ATG" 
+#line  1789 "VBNET.ATG" 
 out name);
 
-#line  1780 "VBNET.ATG" 
+#line  1789 "VBNET.ATG" 
 				pexpr = new FieldReferenceExpression(retExpr, name); 
 				break;
 			}
@@ -3707,77 +3779,77 @@ out name);
 				Expect(10);
 				Identifier();
 
-#line  1782 "VBNET.ATG" 
+#line  1791 "VBNET.ATG" 
 				type = new TypeReference(t.val ?? ""); 
 
-#line  1784 "VBNET.ATG" 
+#line  1793 "VBNET.ATG" 
 				type.IsGlobal = true; 
 
-#line  1785 "VBNET.ATG" 
+#line  1794 "VBNET.ATG" 
 				pexpr = new TypeReferenceExpression(type); 
 				break;
 			}
 			case 127: {
 				ObjectCreateExpression(
-#line  1786 "VBNET.ATG" 
+#line  1795 "VBNET.ATG" 
 out expr);
 
-#line  1786 "VBNET.ATG" 
+#line  1795 "VBNET.ATG" 
 				pexpr = expr; 
 				break;
 			}
 			case 75: case 82: case 199: {
 
-#line  1788 "VBNET.ATG" 
+#line  1797 "VBNET.ATG" 
 				CastType castType = CastType.Cast; 
 				if (la.kind == 82) {
 					lexer.NextToken();
 				} else if (la.kind == 75) {
 					lexer.NextToken();
 
-#line  1790 "VBNET.ATG" 
+#line  1799 "VBNET.ATG" 
 					castType = CastType.Conversion; 
 				} else if (la.kind == 199) {
 					lexer.NextToken();
 
-#line  1791 "VBNET.ATG" 
+#line  1800 "VBNET.ATG" 
 					castType = CastType.TryCast; 
-				} else SynErr(239);
+				} else SynErr(240);
 				Expect(24);
 				Expr(
-#line  1793 "VBNET.ATG" 
+#line  1802 "VBNET.ATG" 
 out expr);
 				Expect(12);
 				TypeName(
-#line  1793 "VBNET.ATG" 
+#line  1802 "VBNET.ATG" 
 out type);
 				Expect(25);
 
-#line  1794 "VBNET.ATG" 
+#line  1803 "VBNET.ATG" 
 				pexpr = new CastExpression(type, expr, castType); 
 				break;
 			}
 			case 59: case 60: case 61: case 62: case 63: case 64: case 66: case 68: case 69: case 72: case 73: case 74: case 194: case 195: case 196: case 197: {
 				CastTarget(
-#line  1795 "VBNET.ATG" 
+#line  1804 "VBNET.ATG" 
 out type);
 				Expect(24);
 				Expr(
-#line  1795 "VBNET.ATG" 
+#line  1804 "VBNET.ATG" 
 out expr);
 				Expect(25);
 
-#line  1795 "VBNET.ATG" 
+#line  1804 "VBNET.ATG" 
 				pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); 
 				break;
 			}
 			case 43: {
 				lexer.NextToken();
 				Expr(
-#line  1796 "VBNET.ATG" 
+#line  1805 "VBNET.ATG" 
 out expr);
 
-#line  1796 "VBNET.ATG" 
+#line  1805 "VBNET.ATG" 
 				pexpr = new AddressOfExpression(expr); 
 				break;
 			}
@@ -3785,312 +3857,312 @@ out expr);
 				lexer.NextToken();
 				Expect(24);
 				GetTypeTypeName(
-#line  1797 "VBNET.ATG" 
+#line  1806 "VBNET.ATG" 
 out type);
 				Expect(25);
 
-#line  1797 "VBNET.ATG" 
+#line  1806 "VBNET.ATG" 
 				pexpr = new TypeOfExpression(type); 
 				break;
 			}
 			case 175: {
 				lexer.NextToken();
 				SimpleExpr(
-#line  1798 "VBNET.ATG" 
+#line  1807 "VBNET.ATG" 
 out expr);
 				Expect(113);
 				TypeName(
-#line  1798 "VBNET.ATG" 
+#line  1807 "VBNET.ATG" 
 out type);
 
-#line  1798 "VBNET.ATG" 
+#line  1807 "VBNET.ATG" 
 				pexpr = new TypeOfIsExpression(expr, type); 
 				break;
 			}
 			}
 			while (la.kind == 10 || la.kind == 24) {
 				InvocationOrMemberReferenceExpression(
-#line  1800 "VBNET.ATG" 
+#line  1809 "VBNET.ATG" 
 ref pexpr);
 			}
 		} else if (la.kind == 10) {
 			lexer.NextToken();
 			IdentifierOrKeyword(
-#line  1803 "VBNET.ATG" 
+#line  1812 "VBNET.ATG" 
 out name);
 
-#line  1803 "VBNET.ATG" 
+#line  1812 "VBNET.ATG" 
 			pexpr = new FieldReferenceExpression(pexpr, name);
 			while (la.kind == 10 || la.kind == 24) {
 				InvocationOrMemberReferenceExpression(
-#line  1804 "VBNET.ATG" 
+#line  1813 "VBNET.ATG" 
 ref pexpr);
 			}
-		} else SynErr(240);
+		} else SynErr(241);
 	}
 
 	void PrimitiveTypeName(
-#line  2947 "VBNET.ATG" 
+#line  2956 "VBNET.ATG" 
 out string type) {
 
-#line  2948 "VBNET.ATG" 
+#line  2957 "VBNET.ATG" 
 		type = String.Empty; 
 		switch (la.kind) {
 		case 52: {
 			lexer.NextToken();
 
-#line  2949 "VBNET.ATG" 
+#line  2958 "VBNET.ATG" 
 			type = "Boolean"; 
 			break;
 		}
 		case 76: {
 			lexer.NextToken();
 
-#line  2950 "VBNET.ATG" 
+#line  2959 "VBNET.ATG" 
 			type = "Date"; 
 			break;
 		}
 		case 65: {
 			lexer.NextToken();
 
-#line  2951 "VBNET.ATG" 
+#line  2960 "VBNET.ATG" 
 			type = "Char"; 
 			break;
 		}
 		case 165: {
 			lexer.NextToken();
 
-#line  2952 "VBNET.ATG" 
+#line  2961 "VBNET.ATG" 
 			type = "String"; 
 			break;
 		}
 		case 77: {
 			lexer.NextToken();
 
-#line  2953 "VBNET.ATG" 
+#line  2962 "VBNET.ATG" 
 			type = "Decimal"; 
 			break;
 		}
 		case 54: {
 			lexer.NextToken();
 
-#line  2954 "VBNET.ATG" 
+#line  2963 "VBNET.ATG" 
 			type = "Byte"; 
 			break;
 		}
 		case 159: {
 			lexer.NextToken();
 
-#line  2955 "VBNET.ATG" 
+#line  2964 "VBNET.ATG" 
 			type = "Short"; 
 			break;
 		}
 		case 111: {
 			lexer.NextToken();
 
-#line  2956 "VBNET.ATG" 
+#line  2965 "VBNET.ATG" 
 			type = "Integer"; 
 			break;
 		}
 		case 117: {
 			lexer.NextToken();
 
-#line  2957 "VBNET.ATG" 
+#line  2966 "VBNET.ATG" 
 			type = "Long"; 
 			break;
 		}
 		case 160: {
 			lexer.NextToken();
 
-#line  2958 "VBNET.ATG" 
+#line  2967 "VBNET.ATG" 
 			type = "Single"; 
 			break;
 		}
 		case 84: {
 			lexer.NextToken();
 
-#line  2959 "VBNET.ATG" 
+#line  2968 "VBNET.ATG" 
 			type = "Double"; 
 			break;
 		}
 		case 191: {
 			lexer.NextToken();
 
-#line  2960 "VBNET.ATG" 
+#line  2969 "VBNET.ATG" 
 			type = "UInteger"; 
 			break;
 		}
 		case 192: {
 			lexer.NextToken();
 
-#line  2961 "VBNET.ATG" 
+#line  2970 "VBNET.ATG" 
 			type = "ULong"; 
 			break;
 		}
 		case 193: {
 			lexer.NextToken();
 
-#line  2962 "VBNET.ATG" 
+#line  2971 "VBNET.ATG" 
 			type = "UShort"; 
 			break;
 		}
 		case 190: {
 			lexer.NextToken();
 
-#line  2963 "VBNET.ATG" 
+#line  2972 "VBNET.ATG" 
 			type = "SByte"; 
 			break;
 		}
-		default: SynErr(241); break;
+		default: SynErr(242); break;
 		}
 	}
 
 	void IdentifierOrKeyword(
-#line  2940 "VBNET.ATG" 
+#line  2949 "VBNET.ATG" 
 out string name) {
 
-#line  2942 "VBNET.ATG" 
+#line  2951 "VBNET.ATG" 
 		lexer.NextToken(); name = t.val;  
 	}
 
 	void CastTarget(
-#line  1845 "VBNET.ATG" 
+#line  1854 "VBNET.ATG" 
 out TypeReference type) {
 
-#line  1847 "VBNET.ATG" 
+#line  1856 "VBNET.ATG" 
 		type = null;
 		
 		switch (la.kind) {
 		case 59: {
 			lexer.NextToken();
 
-#line  1849 "VBNET.ATG" 
+#line  1858 "VBNET.ATG" 
 			type = new TypeReference("System.Boolean"); 
 			break;
 		}
 		case 60: {
 			lexer.NextToken();
 
-#line  1850 "VBNET.ATG" 
+#line  1859 "VBNET.ATG" 
 			type = new TypeReference("System.Byte"); 
 			break;
 		}
 		case 194: {
 			lexer.NextToken();
 
-#line  1851 "VBNET.ATG" 
+#line  1860 "VBNET.ATG" 
 			type = new TypeReference("System.SByte"); 
 			break;
 		}
 		case 61: {
 			lexer.NextToken();
 
-#line  1852 "VBNET.ATG" 
+#line  1861 "VBNET.ATG" 
 			type = new TypeReference("System.Char"); 
 			break;
 		}
 		case 62: {
 			lexer.NextToken();
 
-#line  1853 "VBNET.ATG" 
+#line  1862 "VBNET.ATG" 
 			type = new TypeReference("System.DateTime"); 
 			break;
 		}
 		case 64: {
 			lexer.NextToken();
 
-#line  1854 "VBNET.ATG" 
+#line  1863 "VBNET.ATG" 
 			type = new TypeReference("System.Decimal"); 
 			break;
 		}
 		case 63: {
 			lexer.NextToken();
 
-#line  1855 "VBNET.ATG" 
+#line  1864 "VBNET.ATG" 
 			type = new TypeReference("System.Double"); 
 			break;
 		}
 		case 72: {
 			lexer.NextToken();
 
-#line  1856 "VBNET.ATG" 
+#line  1865 "VBNET.ATG" 
 			type = new TypeReference("System.Int16"); 
 			break;
 		}
 		case 66: {
 			lexer.NextToken();
 
-#line  1857 "VBNET.ATG" 
+#line  1866 "VBNET.ATG" 
 			type = new TypeReference("System.Int32"); 
 			break;
 		}
 		case 68: {
 			lexer.NextToken();
 
-#line  1858 "VBNET.ATG" 
+#line  1867 "VBNET.ATG" 
 			type = new TypeReference("System.Int64"); 
 			break;
 		}
 		case 195: {
 			lexer.NextToken();
 
-#line  1859 "VBNET.ATG" 
+#line  1868 "VBNET.ATG" 
 			type = new TypeReference("System.UInt16"); 
 			break;
 		}
 		case 196: {
 			lexer.NextToken();
 
-#line  1860 "VBNET.ATG" 
+#line  1869 "VBNET.ATG" 
 			type = new TypeReference("System.UInt32"); 
 			break;
 		}
 		case 197: {
 			lexer.NextToken();
 
-#line  1861 "VBNET.ATG" 
+#line  1870 "VBNET.ATG" 
 			type = new TypeReference("System.UInt64"); 
 			break;
 		}
 		case 69: {
 			lexer.NextToken();
 
-#line  1862 "VBNET.ATG" 
+#line  1871 "VBNET.ATG" 
 			type = new TypeReference("System.Object"); 
 			break;
 		}
 		case 73: {
 			lexer.NextToken();
 
-#line  1863 "VBNET.ATG" 
+#line  1872 "VBNET.ATG" 
 			type = new TypeReference("System.Single"); 
 			break;
 		}
 		case 74: {
 			lexer.NextToken();
 
-#line  1864 "VBNET.ATG" 
+#line  1873 "VBNET.ATG" 
 			type = new TypeReference("System.String"); 
 			break;
 		}
-		default: SynErr(242); break;
+		default: SynErr(243); break;
 		}
 	}
 
 	void GetTypeTypeName(
-#line  2088 "VBNET.ATG" 
+#line  2098 "VBNET.ATG" 
 out TypeReference typeref) {
 
-#line  2089 "VBNET.ATG" 
+#line  2099 "VBNET.ATG" 
 		ArrayList rank = null; 
 		NonArrayTypeName(
-#line  2091 "VBNET.ATG" 
+#line  2101 "VBNET.ATG" 
 out typeref, true);
 		ArrayTypeModifiers(
-#line  2092 "VBNET.ATG" 
+#line  2102 "VBNET.ATG" 
 out rank);
 
-#line  2093 "VBNET.ATG" 
+#line  2103 "VBNET.ATG" 
 		if (rank != null && typeref != null) {
 		typeref.RankSpecifier = (int[])rank.ToArray(typeof(int));
 		}
@@ -4098,53 +4170,53 @@ out rank);
 	}
 
 	void InvocationOrMemberReferenceExpression(
-#line  1808 "VBNET.ATG" 
+#line  1817 "VBNET.ATG" 
 ref Expression pexpr) {
 
-#line  1809 "VBNET.ATG" 
+#line  1818 "VBNET.ATG" 
 		string name; 
 		if (la.kind == 10) {
 			lexer.NextToken();
 			IdentifierOrKeyword(
-#line  1811 "VBNET.ATG" 
+#line  1820 "VBNET.ATG" 
 out name);
 
-#line  1811 "VBNET.ATG" 
+#line  1820 "VBNET.ATG" 
 			pexpr = new FieldReferenceExpression(pexpr, name); 
 		} else if (la.kind == 24) {
 			InvocationExpression(
-#line  1812 "VBNET.ATG" 
+#line  1821 "VBNET.ATG" 
 ref pexpr);
-		} else SynErr(243);
+		} else SynErr(244);
 	}
 
 	void InvocationExpression(
-#line  1815 "VBNET.ATG" 
+#line  1824 "VBNET.ATG" 
 ref Expression pexpr) {
 
-#line  1816 "VBNET.ATG" 
+#line  1825 "VBNET.ATG" 
 		List<TypeReference> typeParameters = new List<TypeReference>();
 		List<Expression> parameters = null;
 		TypeReference type; 
 		Expect(24);
 
-#line  1820 "VBNET.ATG" 
+#line  1829 "VBNET.ATG" 
 		Point start = t.Location; 
 		if (la.kind == 200) {
 			lexer.NextToken();
 			TypeName(
-#line  1822 "VBNET.ATG" 
+#line  1831 "VBNET.ATG" 
 out type);
 
-#line  1822 "VBNET.ATG" 
+#line  1831 "VBNET.ATG" 
 			if (type != null) typeParameters.Add(type); 
 			while (la.kind == 12) {
 				lexer.NextToken();
 				TypeName(
-#line  1825 "VBNET.ATG" 
+#line  1834 "VBNET.ATG" 
 out type);
 
-#line  1825 "VBNET.ATG" 
+#line  1834 "VBNET.ATG" 
 				if (type != null) typeParameters.Add(type); 
 			}
 			Expect(25);
@@ -4152,360 +4224,365 @@ out type);
 				lexer.NextToken();
 				Identifier();
 
-#line  1830 "VBNET.ATG" 
+#line  1839 "VBNET.ATG" 
 				pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); 
 			} else if (la.kind == 24) {
 				lexer.NextToken();
 				ArgumentList(
-#line  1832 "VBNET.ATG" 
+#line  1841 "VBNET.ATG" 
 out parameters);
 				Expect(25);
 
-#line  1834 "VBNET.ATG" 
+#line  1843 "VBNET.ATG" 
 				pexpr = new InvocationExpression(pexpr, parameters, typeParameters); 
-			} else SynErr(244);
-		} else if (StartOf(20)) {
+			} else SynErr(245);
+		} else if (StartOf(24)) {
 			ArgumentList(
-#line  1836 "VBNET.ATG" 
+#line  1845 "VBNET.ATG" 
 out parameters);
 			Expect(25);
 
-#line  1838 "VBNET.ATG" 
+#line  1847 "VBNET.ATG" 
 			pexpr = new InvocationExpression(pexpr, parameters, typeParameters); 
-		} else SynErr(245);
+		} else SynErr(246);
 
-#line  1840 "VBNET.ATG" 
+#line  1849 "VBNET.ATG" 
 		pexpr.StartLocation = start; pexpr.EndLocation = t.Location; 
 	}
 
 	void ArgumentList(
-#line  2047 "VBNET.ATG" 
+#line  2058 "VBNET.ATG" 
 out List<Expression> arguments) {
 
-#line  2049 "VBNET.ATG" 
+#line  2060 "VBNET.ATG" 
 		arguments = new List<Expression>();
 		Expression expr = null;
 		
-		if (StartOf(21)) {
+		if (StartOf(20)) {
 			Argument(
-#line  2053 "VBNET.ATG" 
+#line  2063 "VBNET.ATG" 
 out expr);
+		}
+		while (la.kind == 12) {
+			lexer.NextToken();
 
-#line  2053 "VBNET.ATG" 
-			if (expr != null) { arguments.Add(expr); } 
-			while (la.kind == 12) {
-				lexer.NextToken();
+#line  2064 "VBNET.ATG" 
+			arguments.Add(expr ?? Expression.Null); expr = null; 
+			if (StartOf(20)) {
 				Argument(
-#line  2056 "VBNET.ATG" 
+#line  2065 "VBNET.ATG" 
 out expr);
-
-#line  2056 "VBNET.ATG" 
-				if (expr != null) { arguments.Add(expr); } 
 			}
+
+#line  2066 "VBNET.ATG" 
+			if (expr == null) expr = Expression.Null; 
 		}
+
+#line  2068 "VBNET.ATG" 
+		if (expr != null) arguments.Add(expr); 
 	}
 
 	void ConjunctionExpr(
-#line  1883 "VBNET.ATG" 
+#line  1892 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1885 "VBNET.ATG" 
+#line  1894 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		NotExpr(
-#line  1888 "VBNET.ATG" 
+#line  1897 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 45 || la.kind == 46) {
 			if (la.kind == 45) {
 				lexer.NextToken();
 
-#line  1891 "VBNET.ATG" 
+#line  1900 "VBNET.ATG" 
 				op = BinaryOperatorType.BitwiseAnd; 
 			} else {
 				lexer.NextToken();
 
-#line  1892 "VBNET.ATG" 
+#line  1901 "VBNET.ATG" 
 				op = BinaryOperatorType.LogicalAnd; 
 			}
 			NotExpr(
-#line  1894 "VBNET.ATG" 
+#line  1903 "VBNET.ATG" 
 out expr);
 
-#line  1894 "VBNET.ATG" 
+#line  1903 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void NotExpr(
-#line  1898 "VBNET.ATG" 
+#line  1907 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1899 "VBNET.ATG" 
+#line  1908 "VBNET.ATG" 
 		UnaryOperatorType uop = UnaryOperatorType.None; 
 		while (la.kind == 129) {
 			lexer.NextToken();
 
-#line  1900 "VBNET.ATG" 
+#line  1909 "VBNET.ATG" 
 			uop = UnaryOperatorType.Not; 
 		}
 		ComparisonExpr(
-#line  1901 "VBNET.ATG" 
+#line  1910 "VBNET.ATG" 
 out outExpr);
 
-#line  1902 "VBNET.ATG" 
+#line  1911 "VBNET.ATG" 
 		if (uop != UnaryOperatorType.None)
 		outExpr = new UnaryOperatorExpression(outExpr, uop);
 		
 	}
 
 	void ComparisonExpr(
-#line  1907 "VBNET.ATG" 
+#line  1916 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1909 "VBNET.ATG" 
+#line  1918 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ShiftExpr(
-#line  1912 "VBNET.ATG" 
+#line  1921 "VBNET.ATG" 
 out outExpr);
-		while (StartOf(24)) {
+		while (StartOf(25)) {
 			switch (la.kind) {
 			case 27: {
 				lexer.NextToken();
 
-#line  1915 "VBNET.ATG" 
+#line  1924 "VBNET.ATG" 
 				op = BinaryOperatorType.LessThan; 
 				break;
 			}
 			case 26: {
 				lexer.NextToken();
 
-#line  1916 "VBNET.ATG" 
+#line  1925 "VBNET.ATG" 
 				op = BinaryOperatorType.GreaterThan; 
 				break;
 			}
 			case 30: {
 				lexer.NextToken();
 
-#line  1917 "VBNET.ATG" 
+#line  1926 "VBNET.ATG" 
 				op = BinaryOperatorType.LessThanOrEqual; 
 				break;
 			}
 			case 29: {
 				lexer.NextToken();
 
-#line  1918 "VBNET.ATG" 
+#line  1927 "VBNET.ATG" 
 				op = BinaryOperatorType.GreaterThanOrEqual; 
 				break;
 			}
 			case 28: {
 				lexer.NextToken();
 
-#line  1919 "VBNET.ATG" 
+#line  1928 "VBNET.ATG" 
 				op = BinaryOperatorType.InEquality; 
 				break;
 			}
 			case 11: {
 				lexer.NextToken();
 
-#line  1920 "VBNET.ATG" 
+#line  1929 "VBNET.ATG" 
 				op = BinaryOperatorType.Equality; 
 				break;
 			}
 			case 116: {
 				lexer.NextToken();
 
-#line  1921 "VBNET.ATG" 
+#line  1930 "VBNET.ATG" 
 				op = BinaryOperatorType.Like; 
 				break;
 			}
 			case 113: {
 				lexer.NextToken();
 
-#line  1922 "VBNET.ATG" 
+#line  1931 "VBNET.ATG" 
 				op = BinaryOperatorType.ReferenceEquality; 
 				break;
 			}
 			case 189: {
 				lexer.NextToken();
 
-#line  1923 "VBNET.ATG" 
+#line  1932 "VBNET.ATG" 
 				op = BinaryOperatorType.ReferenceInequality; 
 				break;
 			}
 			}
 			ShiftExpr(
-#line  1925 "VBNET.ATG" 
+#line  1934 "VBNET.ATG" 
 out expr);
 
-#line  1925 "VBNET.ATG" 
+#line  1934 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void ShiftExpr(
-#line  1929 "VBNET.ATG" 
+#line  1938 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1931 "VBNET.ATG" 
+#line  1940 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ConcatenationExpr(
-#line  1934 "VBNET.ATG" 
+#line  1943 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 31 || la.kind == 32) {
 			if (la.kind == 31) {
 				lexer.NextToken();
 
-#line  1937 "VBNET.ATG" 
+#line  1946 "VBNET.ATG" 
 				op = BinaryOperatorType.ShiftLeft; 
 			} else {
 				lexer.NextToken();
 
-#line  1938 "VBNET.ATG" 
+#line  1947 "VBNET.ATG" 
 				op = BinaryOperatorType.ShiftRight; 
 			}
 			ConcatenationExpr(
-#line  1940 "VBNET.ATG" 
+#line  1949 "VBNET.ATG" 
 out expr);
 
-#line  1940 "VBNET.ATG" 
+#line  1949 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void ConcatenationExpr(
-#line  1944 "VBNET.ATG" 
+#line  1953 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1945 "VBNET.ATG" 
+#line  1954 "VBNET.ATG" 
 		Expression expr; 
 		AdditiveExpr(
-#line  1947 "VBNET.ATG" 
+#line  1956 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 19) {
 			lexer.NextToken();
 			AdditiveExpr(
-#line  1947 "VBNET.ATG" 
+#line  1956 "VBNET.ATG" 
 out expr);
 
-#line  1947 "VBNET.ATG" 
+#line  1956 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr);  
 		}
 	}
 
 	void AdditiveExpr(
-#line  1950 "VBNET.ATG" 
+#line  1959 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1952 "VBNET.ATG" 
+#line  1961 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ModuloExpr(
-#line  1955 "VBNET.ATG" 
+#line  1964 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 14 || la.kind == 15) {
 			if (la.kind == 14) {
 				lexer.NextToken();
 
-#line  1958 "VBNET.ATG" 
+#line  1967 "VBNET.ATG" 
 				op = BinaryOperatorType.Add; 
 			} else {
 				lexer.NextToken();
 
-#line  1959 "VBNET.ATG" 
+#line  1968 "VBNET.ATG" 
 				op = BinaryOperatorType.Subtract; 
 			}
 			ModuloExpr(
-#line  1961 "VBNET.ATG" 
+#line  1970 "VBNET.ATG" 
 out expr);
 
-#line  1961 "VBNET.ATG" 
+#line  1970 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void ModuloExpr(
-#line  1965 "VBNET.ATG" 
+#line  1974 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1966 "VBNET.ATG" 
+#line  1975 "VBNET.ATG" 
 		Expression expr; 
 		IntegerDivisionExpr(
-#line  1968 "VBNET.ATG" 
+#line  1977 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 120) {
 			lexer.NextToken();
 			IntegerDivisionExpr(
-#line  1968 "VBNET.ATG" 
+#line  1977 "VBNET.ATG" 
 out expr);
 
-#line  1968 "VBNET.ATG" 
+#line  1977 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr);  
 		}
 	}
 
 	void IntegerDivisionExpr(
-#line  1971 "VBNET.ATG" 
+#line  1980 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1972 "VBNET.ATG" 
+#line  1981 "VBNET.ATG" 
 		Expression expr; 
 		MultiplicativeExpr(
-#line  1974 "VBNET.ATG" 
+#line  1983 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 18) {
 			lexer.NextToken();
 			MultiplicativeExpr(
-#line  1974 "VBNET.ATG" 
+#line  1983 "VBNET.ATG" 
 out expr);
 
-#line  1974 "VBNET.ATG" 
+#line  1983 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr);  
 		}
 	}
 
 	void MultiplicativeExpr(
-#line  1977 "VBNET.ATG" 
+#line  1986 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  1979 "VBNET.ATG" 
+#line  1988 "VBNET.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		UnaryExpr(
-#line  1982 "VBNET.ATG" 
+#line  1991 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 16 || la.kind == 17) {
 			if (la.kind == 16) {
 				lexer.NextToken();
 
-#line  1985 "VBNET.ATG" 
+#line  1994 "VBNET.ATG" 
 				op = BinaryOperatorType.Multiply; 
 			} else {
 				lexer.NextToken();
 
-#line  1986 "VBNET.ATG" 
+#line  1995 "VBNET.ATG" 
 				op = BinaryOperatorType.Divide; 
 			}
 			UnaryExpr(
-#line  1988 "VBNET.ATG" 
+#line  1997 "VBNET.ATG" 
 out expr);
 
-#line  1988 "VBNET.ATG" 
+#line  1997 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr); 
 		}
 	}
 
 	void UnaryExpr(
-#line  1992 "VBNET.ATG" 
+#line  2001 "VBNET.ATG" 
 out Expression uExpr) {
 
-#line  1994 "VBNET.ATG" 
+#line  2003 "VBNET.ATG" 
 		Expression expr;
 		UnaryOperatorType uop = UnaryOperatorType.None;
 		bool isUOp = false;
@@ -4514,25 +4591,25 @@ out Expression uExpr) {
 			if (la.kind == 14) {
 				lexer.NextToken();
 
-#line  1998 "VBNET.ATG" 
+#line  2007 "VBNET.ATG" 
 				uop = UnaryOperatorType.Plus; isUOp = true; 
 			} else if (la.kind == 15) {
 				lexer.NextToken();
 
-#line  1999 "VBNET.ATG" 
+#line  2008 "VBNET.ATG" 
 				uop = UnaryOperatorType.Minus; isUOp = true; 
 			} else {
 				lexer.NextToken();
 
-#line  2000 "VBNET.ATG" 
+#line  2009 "VBNET.ATG" 
 				uop = UnaryOperatorType.Star;  isUOp = true;
 			}
 		}
 		ExponentiationExpr(
-#line  2002 "VBNET.ATG" 
+#line  2011 "VBNET.ATG" 
 out expr);
 
-#line  2004 "VBNET.ATG" 
+#line  2013 "VBNET.ATG" 
 		if (isUOp) {
 		uExpr = new UnaryOperatorExpression(expr, uop);
 		} else {
@@ -4542,50 +4619,50 @@ out expr);
 	}
 
 	void ExponentiationExpr(
-#line  2012 "VBNET.ATG" 
+#line  2021 "VBNET.ATG" 
 out Expression outExpr) {
 
-#line  2013 "VBNET.ATG" 
+#line  2022 "VBNET.ATG" 
 		Expression expr; 
 		SimpleExpr(
-#line  2015 "VBNET.ATG" 
+#line  2024 "VBNET.ATG" 
 out outExpr);
 		while (la.kind == 20) {
 			lexer.NextToken();
 			SimpleExpr(
-#line  2015 "VBNET.ATG" 
+#line  2024 "VBNET.ATG" 
 out expr);
 
-#line  2015 "VBNET.ATG" 
+#line  2024 "VBNET.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr);  
 		}
 	}
 
 	void ArrayTypeModifiers(
-#line  2145 "VBNET.ATG" 
+#line  2155 "VBNET.ATG" 
 out ArrayList arrayModifiers) {
 
-#line  2147 "VBNET.ATG" 
+#line  2157 "VBNET.ATG" 
 		arrayModifiers = new ArrayList();
 		int i = 0;
 		
 		while (
-#line  2150 "VBNET.ATG" 
+#line  2160 "VBNET.ATG" 
 IsDims()) {
 			Expect(24);
 			if (la.kind == 12 || la.kind == 25) {
 				RankList(
-#line  2152 "VBNET.ATG" 
+#line  2162 "VBNET.ATG" 
 out i);
 			}
 
-#line  2154 "VBNET.ATG" 
+#line  2164 "VBNET.ATG" 
 			arrayModifiers.Add(i);
 			
 			Expect(25);
 		}
 
-#line  2159 "VBNET.ATG" 
+#line  2169 "VBNET.ATG" 
 		if(arrayModifiers.Count == 0) {
 		 arrayModifiers = null;
 		}
@@ -4593,118 +4670,118 @@ out i);
 	}
 
 	void Argument(
-#line  2062 "VBNET.ATG" 
+#line  2072 "VBNET.ATG" 
 out Expression argumentexpr) {
 
-#line  2064 "VBNET.ATG" 
+#line  2074 "VBNET.ATG" 
 		Expression expr;
 		argumentexpr = null;
 		string name;
 		
 		if (
-#line  2068 "VBNET.ATG" 
+#line  2078 "VBNET.ATG" 
 IsNamedAssign()) {
 			Identifier();
 
-#line  2068 "VBNET.ATG" 
+#line  2078 "VBNET.ATG" 
 			name = t.val;  
 			Expect(13);
 			Expect(11);
 			Expr(
-#line  2068 "VBNET.ATG" 
+#line  2078 "VBNET.ATG" 
 out expr);
 
-#line  2070 "VBNET.ATG" 
+#line  2080 "VBNET.ATG" 
 			argumentexpr = new NamedArgumentExpression(name, expr);
 			
-		} else if (StartOf(21)) {
+		} else if (StartOf(20)) {
 			Expr(
-#line  2073 "VBNET.ATG" 
+#line  2083 "VBNET.ATG" 
 out argumentexpr);
-		} else SynErr(246);
+		} else SynErr(247);
 	}
 
 	void QualIdentAndTypeArguments(
-#line  2119 "VBNET.ATG" 
+#line  2129 "VBNET.ATG" 
 out TypeReference typeref, bool canBeUnbound) {
 
-#line  2120 "VBNET.ATG" 
+#line  2130 "VBNET.ATG" 
 		string name; typeref = null; 
 		Qualident(
-#line  2122 "VBNET.ATG" 
+#line  2132 "VBNET.ATG" 
 out name);
 
-#line  2123 "VBNET.ATG" 
+#line  2133 "VBNET.ATG" 
 		typeref = new TypeReference(name); 
 		if (
-#line  2124 "VBNET.ATG" 
+#line  2134 "VBNET.ATG" 
 la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) {
 			lexer.NextToken();
 			Expect(200);
 			if (
-#line  2126 "VBNET.ATG" 
+#line  2136 "VBNET.ATG" 
 canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) {
 
-#line  2127 "VBNET.ATG" 
+#line  2137 "VBNET.ATG" 
 				typeref.GenericTypes.Add(NullTypeReference.Instance); 
 				while (la.kind == 12) {
 					lexer.NextToken();
 
-#line  2128 "VBNET.ATG" 
+#line  2138 "VBNET.ATG" 
 					typeref.GenericTypes.Add(NullTypeReference.Instance); 
 				}
 			} else if (StartOf(5)) {
 				TypeArgumentList(
-#line  2129 "VBNET.ATG" 
+#line  2139 "VBNET.ATG" 
 typeref.GenericTypes);
-			} else SynErr(247);
+			} else SynErr(248);
 			Expect(25);
 		}
 	}
 
 	void TypeArgumentList(
-#line  2172 "VBNET.ATG" 
+#line  2182 "VBNET.ATG" 
 List<TypeReference> typeArguments) {
 
-#line  2174 "VBNET.ATG" 
+#line  2184 "VBNET.ATG" 
 		TypeReference typeref;
 		
 		TypeName(
-#line  2176 "VBNET.ATG" 
+#line  2186 "VBNET.ATG" 
 out typeref);
 
-#line  2176 "VBNET.ATG" 
+#line  2186 "VBNET.ATG" 
 		if (typeref != null) typeArguments.Add(typeref); 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			TypeName(
-#line  2179 "VBNET.ATG" 
+#line  2189 "VBNET.ATG" 
 out typeref);
 
-#line  2179 "VBNET.ATG" 
+#line  2189 "VBNET.ATG" 
 			if (typeref != null) typeArguments.Add(typeref); 
 		}
 	}
 
 	void RankList(
-#line  2166 "VBNET.ATG" 
+#line  2176 "VBNET.ATG" 
 out int i) {
 
-#line  2167 "VBNET.ATG" 
+#line  2177 "VBNET.ATG" 
 		i = 0; 
 		while (la.kind == 12) {
 			lexer.NextToken();
 
-#line  2168 "VBNET.ATG" 
+#line  2178 "VBNET.ATG" 
 			++i; 
 		}
 	}
 
 	void Attribute(
-#line  2204 "VBNET.ATG" 
+#line  2214 "VBNET.ATG" 
 out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) {
 
-#line  2205 "VBNET.ATG" 
+#line  2215 "VBNET.ATG" 
 		string name;
 		List<Expression> positional = new List<Expression>();
 		List<NamedArgumentExpression> named = new List<NamedArgumentExpression>();
@@ -4714,39 +4791,39 @@ out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) {
 			Expect(10);
 		}
 		Qualident(
-#line  2210 "VBNET.ATG" 
+#line  2220 "VBNET.ATG" 
 out name);
 		if (la.kind == 24) {
 			AttributeArguments(
-#line  2211 "VBNET.ATG" 
+#line  2221 "VBNET.ATG" 
 positional, named);
 		}
 
-#line  2212 "VBNET.ATG" 
+#line  2222 "VBNET.ATG" 
 		attribute  = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); 
 	}
 
 	void AttributeArguments(
-#line  2216 "VBNET.ATG" 
+#line  2226 "VBNET.ATG" 
 List<Expression> positional, List<NamedArgumentExpression> named) {
 
-#line  2218 "VBNET.ATG" 
+#line  2228 "VBNET.ATG" 
 		bool nameFound = false;
 		string name = "";
 		Expression expr;
 		
 		Expect(24);
 		if (
-#line  2224 "VBNET.ATG" 
+#line  2234 "VBNET.ATG" 
 IsNotClosingParenthesis()) {
 			if (
-#line  2226 "VBNET.ATG" 
+#line  2236 "VBNET.ATG" 
 IsNamedAssign()) {
 
-#line  2226 "VBNET.ATG" 
+#line  2236 "VBNET.ATG" 
 				nameFound = true; 
 				IdentifierOrKeyword(
-#line  2227 "VBNET.ATG" 
+#line  2237 "VBNET.ATG" 
 out name);
 				if (la.kind == 13) {
 					lexer.NextToken();
@@ -4754,10 +4831,10 @@ out name);
 				Expect(11);
 			}
 			Expr(
-#line  2229 "VBNET.ATG" 
+#line  2239 "VBNET.ATG" 
 out expr);
 
-#line  2231 "VBNET.ATG" 
+#line  2241 "VBNET.ATG" 
 			if (expr != null) { if(name == "") positional.Add(expr);
 			else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; }
 			}
@@ -4765,28 +4842,28 @@ out expr);
 			while (la.kind == 12) {
 				lexer.NextToken();
 				if (
-#line  2238 "VBNET.ATG" 
+#line  2248 "VBNET.ATG" 
 IsNamedAssign()) {
 
-#line  2238 "VBNET.ATG" 
+#line  2248 "VBNET.ATG" 
 					nameFound = true; 
 					IdentifierOrKeyword(
-#line  2239 "VBNET.ATG" 
+#line  2249 "VBNET.ATG" 
 out name);
 					if (la.kind == 13) {
 						lexer.NextToken();
 					}
 					Expect(11);
-				} else if (StartOf(21)) {
+				} else if (StartOf(20)) {
 
-#line  2241 "VBNET.ATG" 
+#line  2251 "VBNET.ATG" 
 					if (nameFound) Error("no positional argument after named argument"); 
-				} else SynErr(248);
+				} else SynErr(249);
 				Expr(
-#line  2242 "VBNET.ATG" 
+#line  2252 "VBNET.ATG" 
 out expr);
 
-#line  2242 "VBNET.ATG" 
+#line  2252 "VBNET.ATG" 
 				if (expr != null) { if(name == "") positional.Add(expr);
 				else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; }
 				}
@@ -4797,39 +4874,39 @@ out expr);
 	}
 
 	void FormalParameter(
-#line  2311 "VBNET.ATG" 
+#line  2321 "VBNET.ATG" 
 out ParameterDeclarationExpression p) {
 
-#line  2313 "VBNET.ATG" 
+#line  2323 "VBNET.ATG" 
 		TypeReference type = null;
 		ParamModifiers mod = new ParamModifiers(this);
 		Expression expr = null;
 		p = null;ArrayList arrayModifiers = null;
 		
-		while (StartOf(25)) {
+		while (StartOf(26)) {
 			ParameterModifier(
-#line  2318 "VBNET.ATG" 
+#line  2328 "VBNET.ATG" 
 mod);
 		}
 		Identifier();
 
-#line  2319 "VBNET.ATG" 
+#line  2329 "VBNET.ATG" 
 		string parameterName = t.val; 
 		if (
-#line  2320 "VBNET.ATG" 
+#line  2330 "VBNET.ATG" 
 IsDims()) {
 			ArrayTypeModifiers(
-#line  2320 "VBNET.ATG" 
+#line  2330 "VBNET.ATG" 
 out arrayModifiers);
 		}
 		if (la.kind == 48) {
 			lexer.NextToken();
 			TypeName(
-#line  2321 "VBNET.ATG" 
+#line  2331 "VBNET.ATG" 
 out type);
 		}
 
-#line  2323 "VBNET.ATG" 
+#line  2333 "VBNET.ATG" 
 		if(type != null) {
 		if (arrayModifiers != null) {
 			if (type.RankSpecifier != null) {
@@ -4845,45 +4922,45 @@ out type);
 		if (la.kind == 11) {
 			lexer.NextToken();
 			Expr(
-#line  2335 "VBNET.ATG" 
+#line  2345 "VBNET.ATG" 
 out expr);
 		}
 
-#line  2337 "VBNET.ATG" 
+#line  2347 "VBNET.ATG" 
 		mod.Check();
 		p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr);
 		
 	}
 
 	void ParameterModifier(
-#line  2966 "VBNET.ATG" 
+#line  2975 "VBNET.ATG" 
 ParamModifiers m) {
 		if (la.kind == 55) {
 			lexer.NextToken();
 
-#line  2967 "VBNET.ATG" 
+#line  2976 "VBNET.ATG" 
 			m.Add(ParamModifier.In); 
 		} else if (la.kind == 53) {
 			lexer.NextToken();
 
-#line  2968 "VBNET.ATG" 
+#line  2977 "VBNET.ATG" 
 			m.Add(ParamModifier.Ref); 
 		} else if (la.kind == 137) {
 			lexer.NextToken();
 
-#line  2969 "VBNET.ATG" 
+#line  2978 "VBNET.ATG" 
 			m.Add(ParamModifier.Optional); 
 		} else if (la.kind == 143) {
 			lexer.NextToken();
 
-#line  2970 "VBNET.ATG" 
+#line  2979 "VBNET.ATG" 
 			m.Add(ParamModifier.Params); 
-		} else SynErr(249);
+		} else SynErr(250);
 	}
 
 	void Statement() {
 
-#line  2364 "VBNET.ATG" 
+#line  2374 "VBNET.ATG" 
 		Statement stmt = null;
 		Point startPos = la.Location;
 		string label = String.Empty;
@@ -4891,34 +4968,34 @@ ParamModifiers m) {
 		
 		if (la.kind == 1 || la.kind == 13) {
 		} else if (
-#line  2370 "VBNET.ATG" 
+#line  2380 "VBNET.ATG" 
 IsLabel()) {
 			LabelName(
-#line  2370 "VBNET.ATG" 
+#line  2380 "VBNET.ATG" 
 out label);
 
-#line  2372 "VBNET.ATG" 
+#line  2382 "VBNET.ATG" 
 			compilationUnit.AddChild(new LabelStatement(t.val));
 			
 			Expect(13);
 			Statement();
-		} else if (StartOf(26)) {
+		} else if (StartOf(27)) {
 			EmbeddedStatement(
-#line  2375 "VBNET.ATG" 
+#line  2385 "VBNET.ATG" 
 out stmt);
 
-#line  2375 "VBNET.ATG" 
+#line  2385 "VBNET.ATG" 
 			compilationUnit.AddChild(stmt); 
-		} else if (StartOf(27)) {
+		} else if (StartOf(28)) {
 			LocalDeclarationStatement(
-#line  2376 "VBNET.ATG" 
+#line  2386 "VBNET.ATG" 
 out stmt);
 
-#line  2376 "VBNET.ATG" 
+#line  2386 "VBNET.ATG" 
 			compilationUnit.AddChild(stmt); 
-		} else SynErr(250);
+		} else SynErr(251);
 
-#line  2379 "VBNET.ATG" 
+#line  2389 "VBNET.ATG" 
 		if (stmt != null) {
 		stmt.StartLocation = startPos;
 		stmt.EndLocation = t.Location;
@@ -4927,30 +5004,30 @@ out stmt);
 	}
 
 	void LabelName(
-#line  2766 "VBNET.ATG" 
+#line  2760 "VBNET.ATG" 
 out string name) {
 
-#line  2768 "VBNET.ATG" 
+#line  2762 "VBNET.ATG" 
 		name = String.Empty;
 		
 		if (StartOf(12)) {
 			Identifier();
 
-#line  2770 "VBNET.ATG" 
+#line  2764 "VBNET.ATG" 
 			name = t.val; 
 		} else if (la.kind == 5) {
 			lexer.NextToken();
 
-#line  2771 "VBNET.ATG" 
+#line  2765 "VBNET.ATG" 
 			name = t.val; 
-		} else SynErr(251);
+		} else SynErr(252);
 	}
 
 	void EmbeddedStatement(
-#line  2418 "VBNET.ATG" 
+#line  2428 "VBNET.ATG" 
 out Statement statement) {
 
-#line  2420 "VBNET.ATG" 
+#line  2430 "VBNET.ATG" 
 		Statement embeddedStatement = null;
 		statement = null;
 		Expression expr = null;
@@ -4961,143 +5038,143 @@ out Statement statement) {
 		case 94: {
 			lexer.NextToken();
 
-#line  2426 "VBNET.ATG" 
+#line  2436 "VBNET.ATG" 
 			ExitType exitType = ExitType.None; 
 			switch (la.kind) {
 			case 167: {
 				lexer.NextToken();
 
-#line  2428 "VBNET.ATG" 
+#line  2438 "VBNET.ATG" 
 				exitType = ExitType.Sub; 
 				break;
 			}
 			case 100: {
 				lexer.NextToken();
 
-#line  2430 "VBNET.ATG" 
+#line  2440 "VBNET.ATG" 
 				exitType = ExitType.Function; 
 				break;
 			}
 			case 146: {
 				lexer.NextToken();
 
-#line  2432 "VBNET.ATG" 
+#line  2442 "VBNET.ATG" 
 				exitType = ExitType.Property; 
 				break;
 			}
 			case 83: {
 				lexer.NextToken();
 
-#line  2434 "VBNET.ATG" 
+#line  2444 "VBNET.ATG" 
 				exitType = ExitType.Do; 
 				break;
 			}
 			case 98: {
 				lexer.NextToken();
 
-#line  2436 "VBNET.ATG" 
+#line  2446 "VBNET.ATG" 
 				exitType = ExitType.For; 
 				break;
 			}
 			case 174: {
 				lexer.NextToken();
 
-#line  2438 "VBNET.ATG" 
+#line  2448 "VBNET.ATG" 
 				exitType = ExitType.Try; 
 				break;
 			}
 			case 181: {
 				lexer.NextToken();
 
-#line  2440 "VBNET.ATG" 
+#line  2450 "VBNET.ATG" 
 				exitType = ExitType.While; 
 				break;
 			}
 			case 155: {
 				lexer.NextToken();
 
-#line  2442 "VBNET.ATG" 
+#line  2452 "VBNET.ATG" 
 				exitType = ExitType.Select; 
 				break;
 			}
-			default: SynErr(252); break;
+			default: SynErr(253); break;
 			}
 
-#line  2444 "VBNET.ATG" 
+#line  2454 "VBNET.ATG" 
 			statement = new ExitStatement(exitType); 
 			break;
 		}
 		case 174: {
 			TryStatement(
-#line  2445 "VBNET.ATG" 
+#line  2455 "VBNET.ATG" 
 out statement);
 			break;
 		}
 		case 186: {
 			lexer.NextToken();
 
-#line  2446 "VBNET.ATG" 
+#line  2456 "VBNET.ATG" 
 			ContinueType continueType = ContinueType.None; 
 			if (la.kind == 83 || la.kind == 98 || la.kind == 181) {
 				if (la.kind == 83) {
 					lexer.NextToken();
 
-#line  2446 "VBNET.ATG" 
+#line  2456 "VBNET.ATG" 
 					continueType = ContinueType.Do; 
 				} else if (la.kind == 98) {
 					lexer.NextToken();
 
-#line  2446 "VBNET.ATG" 
+#line  2456 "VBNET.ATG" 
 					continueType = ContinueType.For; 
 				} else {
 					lexer.NextToken();
 
-#line  2446 "VBNET.ATG" 
+#line  2456 "VBNET.ATG" 
 					continueType = ContinueType.While; 
 				}
 			}
 
-#line  2446 "VBNET.ATG" 
+#line  2456 "VBNET.ATG" 
 			statement = new ContinueStatement(continueType); 
 			break;
 		}
 		case 171: {
 			lexer.NextToken();
-			if (StartOf(21)) {
+			if (StartOf(20)) {
 				Expr(
-#line  2448 "VBNET.ATG" 
+#line  2458 "VBNET.ATG" 
 out expr);
 			}
 
-#line  2448 "VBNET.ATG" 
+#line  2458 "VBNET.ATG" 
 			statement = new ThrowStatement(expr); 
 			break;
 		}
 		case 154: {
 			lexer.NextToken();
-			if (StartOf(21)) {
+			if (StartOf(20)) {
 				Expr(
-#line  2450 "VBNET.ATG" 
+#line  2460 "VBNET.ATG" 
 out expr);
 			}
 
-#line  2450 "VBNET.ATG" 
+#line  2460 "VBNET.ATG" 
 			statement = new ReturnStatement(expr); 
 			break;
 		}
 		case 168: {
 			lexer.NextToken();
 			Expr(
-#line  2452 "VBNET.ATG" 
+#line  2462 "VBNET.ATG" 
 out expr);
 			EndOfStmt();
 			Block(
-#line  2452 "VBNET.ATG" 
+#line  2462 "VBNET.ATG" 
 out embeddedStatement);
 			Expect(88);
 			Expect(168);
 
-#line  2453 "VBNET.ATG" 
+#line  2463 "VBNET.ATG" 
 			statement = new LockStatement(expr, embeddedStatement); 
 			break;
 		}
@@ -5105,42 +5182,42 @@ out embeddedStatement);
 			lexer.NextToken();
 			Identifier();
 
-#line  2455 "VBNET.ATG" 
+#line  2465 "VBNET.ATG" 
 			name = t.val; 
 			if (la.kind == 24) {
 				lexer.NextToken();
-				if (StartOf(20)) {
+				if (StartOf(24)) {
 					ArgumentList(
-#line  2456 "VBNET.ATG" 
+#line  2466 "VBNET.ATG" 
 out p);
 				}
 				Expect(25);
 			}
 
-#line  2457 "VBNET.ATG" 
+#line  2467 "VBNET.ATG" 
 			statement = new RaiseEventStatement(name, p); 
 			break;
 		}
 		case 182: {
 			WithStatement(
-#line  2459 "VBNET.ATG" 
+#line  2469 "VBNET.ATG" 
 out statement);
 			break;
 		}
 		case 42: {
 			lexer.NextToken();
 
-#line  2461 "VBNET.ATG" 
+#line  2471 "VBNET.ATG" 
 			Expression handlerExpr = null; 
 			Expr(
-#line  2462 "VBNET.ATG" 
+#line  2472 "VBNET.ATG" 
 out expr);
 			Expect(12);
 			Expr(
-#line  2462 "VBNET.ATG" 
+#line  2472 "VBNET.ATG" 
 out handlerExpr);
 
-#line  2464 "VBNET.ATG" 
+#line  2474 "VBNET.ATG" 
 			statement = new AddHandlerStatement(expr, handlerExpr);
 			
 			break;
@@ -5148,17 +5225,17 @@ out handlerExpr);
 		case 152: {
 			lexer.NextToken();
 
-#line  2467 "VBNET.ATG" 
+#line  2477 "VBNET.ATG" 
 			Expression handlerExpr = null; 
 			Expr(
-#line  2468 "VBNET.ATG" 
+#line  2478 "VBNET.ATG" 
 out expr);
 			Expect(12);
 			Expr(
-#line  2468 "VBNET.ATG" 
+#line  2478 "VBNET.ATG" 
 out handlerExpr);
 
-#line  2470 "VBNET.ATG" 
+#line  2480 "VBNET.ATG" 
 			statement = new RemoveHandlerStatement(expr, handlerExpr);
 			
 			break;
@@ -5166,16 +5243,16 @@ out handlerExpr);
 		case 181: {
 			lexer.NextToken();
 			Expr(
-#line  2473 "VBNET.ATG" 
+#line  2483 "VBNET.ATG" 
 out expr);
 			EndOfStmt();
 			Block(
-#line  2474 "VBNET.ATG" 
+#line  2484 "VBNET.ATG" 
 out embeddedStatement);
 			Expect(88);
 			Expect(181);
 
-#line  2476 "VBNET.ATG" 
+#line  2486 "VBNET.ATG" 
 			statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start);
 			
 			break;
@@ -5183,23 +5260,23 @@ out embeddedStatement);
 		case 83: {
 			lexer.NextToken();
 
-#line  2481 "VBNET.ATG" 
+#line  2491 "VBNET.ATG" 
 			ConditionType conditionType = ConditionType.None;
 			
 			if (la.kind == 177 || la.kind == 181) {
 				WhileOrUntil(
-#line  2484 "VBNET.ATG" 
+#line  2494 "VBNET.ATG" 
 out conditionType);
 				Expr(
-#line  2484 "VBNET.ATG" 
+#line  2494 "VBNET.ATG" 
 out expr);
 				EndOfStmt();
 				Block(
-#line  2485 "VBNET.ATG" 
+#line  2495 "VBNET.ATG" 
 out embeddedStatement);
 				Expect(118);
 
-#line  2488 "VBNET.ATG" 
+#line  2498 "VBNET.ATG" 
 				statement = new DoLoopStatement(expr, 
 				                               embeddedStatement, 
 				                               conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, 
@@ -5208,28 +5285,28 @@ out embeddedStatement);
 			} else if (la.kind == 1 || la.kind == 13) {
 				EndOfStmt();
 				Block(
-#line  2495 "VBNET.ATG" 
+#line  2505 "VBNET.ATG" 
 out embeddedStatement);
 				Expect(118);
 				if (la.kind == 177 || la.kind == 181) {
 					WhileOrUntil(
-#line  2496 "VBNET.ATG" 
+#line  2506 "VBNET.ATG" 
 out conditionType);
 					Expr(
-#line  2496 "VBNET.ATG" 
+#line  2506 "VBNET.ATG" 
 out expr);
 				}
 
-#line  2498 "VBNET.ATG" 
+#line  2508 "VBNET.ATG" 
 				statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End);
 				
-			} else SynErr(253);
+			} else SynErr(254);
 			break;
 		}
 		case 98: {
 			lexer.NextToken();
 
-#line  2503 "VBNET.ATG" 
+#line  2513 "VBNET.ATG" 
 			Expression group = null;
 			TypeReference typeReference;
 			string        typeName;
@@ -5238,24 +5315,24 @@ out expr);
 			if (la.kind == 85) {
 				lexer.NextToken();
 				LoopControlVariable(
-#line  2510 "VBNET.ATG" 
+#line  2520 "VBNET.ATG" 
 out typeReference, out typeName);
 				Expect(109);
 				Expr(
-#line  2511 "VBNET.ATG" 
+#line  2521 "VBNET.ATG" 
 out group);
 				EndOfStmt();
 				Block(
-#line  2512 "VBNET.ATG" 
+#line  2522 "VBNET.ATG" 
 out embeddedStatement);
 				Expect(128);
-				if (StartOf(21)) {
+				if (StartOf(20)) {
 					Expr(
-#line  2513 "VBNET.ATG" 
+#line  2523 "VBNET.ATG" 
 out expr);
 				}
 
-#line  2515 "VBNET.ATG" 
+#line  2525 "VBNET.ATG" 
 				statement = new ForeachStatement(typeReference, 
 				                                typeName,
 				                                group, 
@@ -5267,84 +5344,84 @@ out expr);
 				
 			} else if (StartOf(12)) {
 
-#line  2526 "VBNET.ATG" 
+#line  2536 "VBNET.ATG" 
 				Expression start = null;
 				Expression end = null;
 				Expression step = null;
 				Expression nextExpr = null;List<Expression> nextExpressions = null;
 				
 				LoopControlVariable(
-#line  2531 "VBNET.ATG" 
+#line  2541 "VBNET.ATG" 
 out typeReference, out typeName);
 				Expect(11);
 				Expr(
-#line  2532 "VBNET.ATG" 
+#line  2542 "VBNET.ATG" 
 out start);
 				Expect(172);
 				Expr(
-#line  2532 "VBNET.ATG" 
+#line  2542 "VBNET.ATG" 
 out end);
 				if (la.kind == 162) {
 					lexer.NextToken();
 					Expr(
-#line  2532 "VBNET.ATG" 
+#line  2542 "VBNET.ATG" 
 out step);
 				}
 				EndOfStmt();
 				Block(
-#line  2533 "VBNET.ATG" 
+#line  2543 "VBNET.ATG" 
 out embeddedStatement);
 				Expect(128);
-				if (StartOf(21)) {
+				if (StartOf(20)) {
 					Expr(
-#line  2536 "VBNET.ATG" 
+#line  2546 "VBNET.ATG" 
 out nextExpr);
 
-#line  2536 "VBNET.ATG" 
+#line  2546 "VBNET.ATG" 
 					nextExpressions = new List<Expression>(); nextExpressions.Add(nextExpr); 
 					while (la.kind == 12) {
 						lexer.NextToken();
 						Expr(
-#line  2537 "VBNET.ATG" 
+#line  2547 "VBNET.ATG" 
 out nextExpr);
 
-#line  2537 "VBNET.ATG" 
+#line  2547 "VBNET.ATG" 
 						nextExpressions.Add(nextExpr); 
 					}
 				}
 
-#line  2540 "VBNET.ATG" 
+#line  2550 "VBNET.ATG" 
 				statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions);
 				
-			} else SynErr(254);
+			} else SynErr(255);
 			break;
 		}
 		case 92: {
 			lexer.NextToken();
 			Expr(
-#line  2544 "VBNET.ATG" 
+#line  2554 "VBNET.ATG" 
 out expr);
 
-#line  2544 "VBNET.ATG" 
+#line  2554 "VBNET.ATG" 
 			statement = new ErrorStatement(expr); 
 			break;
 		}
 		case 151: {
 			lexer.NextToken();
 
-#line  2546 "VBNET.ATG" 
+#line  2556 "VBNET.ATG" 
 			bool isPreserve = false; 
 			if (la.kind == 144) {
 				lexer.NextToken();
 
-#line  2546 "VBNET.ATG" 
+#line  2556 "VBNET.ATG" 
 				isPreserve = true; 
 			}
 			Expr(
-#line  2547 "VBNET.ATG" 
+#line  2557 "VBNET.ATG" 
 out expr);
 
-#line  2549 "VBNET.ATG" 
+#line  2559 "VBNET.ATG" 
 			ReDimStatement reDimStatement = new ReDimStatement(isPreserve);
 			statement = reDimStatement;
 			InvocationExpression redimClause = expr as InvocationExpression;
@@ -5353,13 +5430,13 @@ out expr);
 			while (la.kind == 12) {
 				lexer.NextToken();
 				Expr(
-#line  2554 "VBNET.ATG" 
+#line  2564 "VBNET.ATG" 
 out expr);
 
-#line  2555 "VBNET.ATG" 
+#line  2565 "VBNET.ATG" 
 				redimClause = expr as InvocationExpression; 
 
-#line  2556 "VBNET.ATG" 
+#line  2566 "VBNET.ATG" 
 				if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } 
 			}
 			break;
@@ -5367,10 +5444,10 @@ out expr);
 		case 91: {
 			lexer.NextToken();
 			Expr(
-#line  2560 "VBNET.ATG" 
+#line  2570 "VBNET.ATG" 
 out expr);
 
-#line  2561 "VBNET.ATG" 
+#line  2571 "VBNET.ATG" 
 			List<Expression> arrays = new List<Expression>();
 			if (expr != null) { arrays.Add(expr);}
 			EraseStatement eraseStatement = new EraseStatement(arrays);
@@ -5379,53 +5456,53 @@ out expr);
 			while (la.kind == 12) {
 				lexer.NextToken();
 				Expr(
-#line  2566 "VBNET.ATG" 
+#line  2576 "VBNET.ATG" 
 out expr);
 
-#line  2566 "VBNET.ATG" 
+#line  2576 "VBNET.ATG" 
 				if (expr != null) { arrays.Add(expr); }
 			}
 
-#line  2567 "VBNET.ATG" 
+#line  2577 "VBNET.ATG" 
 			statement = eraseStatement; 
 			break;
 		}
 		case 163: {
 			lexer.NextToken();
 
-#line  2569 "VBNET.ATG" 
+#line  2579 "VBNET.ATG" 
 			statement = new StopStatement(); 
 			break;
 		}
 		case 106: {
 			lexer.NextToken();
 			Expr(
-#line  2571 "VBNET.ATG" 
+#line  2581 "VBNET.ATG" 
 out expr);
 			if (la.kind == 170) {
 				lexer.NextToken();
 			}
 			if (
-#line  2573 "VBNET.ATG" 
+#line  2583 "VBNET.ATG" 
 IsEndStmtAhead()) {
 				Expect(88);
 
-#line  2573 "VBNET.ATG" 
+#line  2583 "VBNET.ATG" 
 				statement = new IfElseStatement(expr, new EndStatement()); 
 			} else if (la.kind == 1 || la.kind == 13) {
 				EndOfStmt();
 				Block(
-#line  2576 "VBNET.ATG" 
+#line  2586 "VBNET.ATG" 
 out embeddedStatement);
 
-#line  2578 "VBNET.ATG" 
+#line  2588 "VBNET.ATG" 
 				IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement);
 				
 				while (la.kind == 87 || 
-#line  2582 "VBNET.ATG" 
+#line  2592 "VBNET.ATG" 
 IsElseIf()) {
 					if (
-#line  2582 "VBNET.ATG" 
+#line  2592 "VBNET.ATG" 
 IsElseIf()) {
 						Expect(86);
 						Expect(106);
@@ -5433,20 +5510,20 @@ IsElseIf()) {
 						lexer.NextToken();
 					}
 
-#line  2585 "VBNET.ATG" 
+#line  2595 "VBNET.ATG" 
 					Expression condition = null; Statement block = null; 
 					Expr(
-#line  2586 "VBNET.ATG" 
+#line  2596 "VBNET.ATG" 
 out condition);
 					if (la.kind == 170) {
 						lexer.NextToken();
 					}
 					EndOfStmt();
 					Block(
-#line  2587 "VBNET.ATG" 
+#line  2597 "VBNET.ATG" 
 out block);
 
-#line  2589 "VBNET.ATG" 
+#line  2599 "VBNET.ATG" 
 					ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block));
 					
 				}
@@ -5454,61 +5531,61 @@ out block);
 					lexer.NextToken();
 					EndOfStmt();
 					Block(
-#line  2594 "VBNET.ATG" 
+#line  2604 "VBNET.ATG" 
 out embeddedStatement);
 
-#line  2596 "VBNET.ATG" 
+#line  2606 "VBNET.ATG" 
 					ifStatement.FalseStatement.Add(embeddedStatement);
 					
 				}
 				Expect(88);
 				Expect(106);
 
-#line  2600 "VBNET.ATG" 
+#line  2610 "VBNET.ATG" 
 				statement = ifStatement;
 				
-			} else if (StartOf(26)) {
+			} else if (StartOf(27)) {
 				EmbeddedStatement(
-#line  2603 "VBNET.ATG" 
+#line  2613 "VBNET.ATG" 
 out embeddedStatement);
 
-#line  2605 "VBNET.ATG" 
+#line  2615 "VBNET.ATG" 
 				IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement);
 				
 				while (la.kind == 13) {
 					lexer.NextToken();
 					EmbeddedStatement(
-#line  2607 "VBNET.ATG" 
+#line  2617 "VBNET.ATG" 
 out embeddedStatement);
 
-#line  2607 "VBNET.ATG" 
+#line  2617 "VBNET.ATG" 
 					ifStatement.TrueStatement.Add(embeddedStatement); 
 				}
 				if (la.kind == 86) {
 					lexer.NextToken();
-					if (StartOf(26)) {
+					if (StartOf(27)) {
 						EmbeddedStatement(
-#line  2609 "VBNET.ATG" 
+#line  2619 "VBNET.ATG" 
 out embeddedStatement);
 					}
 
-#line  2611 "VBNET.ATG" 
+#line  2621 "VBNET.ATG" 
 					ifStatement.FalseStatement.Add(embeddedStatement);
 					
 					while (la.kind == 13) {
 						lexer.NextToken();
 						EmbeddedStatement(
-#line  2614 "VBNET.ATG" 
+#line  2624 "VBNET.ATG" 
 out embeddedStatement);
 
-#line  2615 "VBNET.ATG" 
+#line  2625 "VBNET.ATG" 
 						ifStatement.FalseStatement.Add(embeddedStatement); 
 					}
 				}
 
-#line  2618 "VBNET.ATG" 
+#line  2628 "VBNET.ATG" 
 				statement = ifStatement; 
-			} else SynErr(255);
+			} else SynErr(256);
 			break;
 		}
 		case 155: {
@@ -5517,43 +5594,43 @@ out embeddedStatement);
 				lexer.NextToken();
 			}
 			Expr(
-#line  2621 "VBNET.ATG" 
+#line  2631 "VBNET.ATG" 
 out expr);
 			EndOfStmt();
 
-#line  2622 "VBNET.ATG" 
+#line  2632 "VBNET.ATG" 
 			List<SwitchSection> selectSections = new List<SwitchSection>();
 			Statement block = null;
 			
 			while (la.kind == 57) {
 
-#line  2626 "VBNET.ATG" 
+#line  2636 "VBNET.ATG" 
 				List<CaseLabel> caseClauses = null; 
 				lexer.NextToken();
 				CaseClauses(
-#line  2627 "VBNET.ATG" 
+#line  2637 "VBNET.ATG" 
 out caseClauses);
 				if (
-#line  2627 "VBNET.ATG" 
+#line  2637 "VBNET.ATG" 
 IsNotStatementSeparator()) {
 					lexer.NextToken();
 				}
 				EndOfStmt();
 
-#line  2629 "VBNET.ATG" 
+#line  2639 "VBNET.ATG" 
 				SwitchSection selectSection = new SwitchSection(caseClauses);
 				
 				Block(
-#line  2631 "VBNET.ATG" 
+#line  2641 "VBNET.ATG" 
 out block);
 
-#line  2633 "VBNET.ATG" 
+#line  2643 "VBNET.ATG" 
 				selectSection.Children = block.Children;
 				selectSections.Add(selectSection);
 				
 			}
 
-#line  2637 "VBNET.ATG" 
+#line  2647 "VBNET.ATG" 
 			statement = new SwitchStatement(expr, selectSections); 
 			Expect(88);
 			Expect(155);
@@ -5561,43 +5638,43 @@ out block);
 		}
 		case 135: {
 
-#line  2639 "VBNET.ATG" 
+#line  2649 "VBNET.ATG" 
 			OnErrorStatement onErrorStatement = null; 
 			OnErrorStatement(
-#line  2640 "VBNET.ATG" 
+#line  2650 "VBNET.ATG" 
 out onErrorStatement);
 
-#line  2640 "VBNET.ATG" 
+#line  2650 "VBNET.ATG" 
 			statement = onErrorStatement; 
 			break;
 		}
 		case 104: {
 
-#line  2641 "VBNET.ATG" 
+#line  2651 "VBNET.ATG" 
 			GotoStatement goToStatement = null; 
 			GotoStatement(
-#line  2642 "VBNET.ATG" 
+#line  2652 "VBNET.ATG" 
 out goToStatement);
 
-#line  2642 "VBNET.ATG" 
+#line  2652 "VBNET.ATG" 
 			statement = goToStatement; 
 			break;
 		}
 		case 153: {
 
-#line  2643 "VBNET.ATG" 
+#line  2653 "VBNET.ATG" 
 			ResumeStatement resumeStatement = null; 
 			ResumeStatement(
-#line  2644 "VBNET.ATG" 
+#line  2654 "VBNET.ATG" 
 out resumeStatement);
 
-#line  2644 "VBNET.ATG" 
+#line  2654 "VBNET.ATG" 
 			statement = resumeStatement; 
 			break;
 		}
-		case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 24: case 43: case 47: case 49: case 50: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: case 144: case 159: case 160: case 165: case 169: case 173: case 175: case 176: case 177: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: {
+		case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 24: case 43: case 47: case 49: case 50: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: case 133: case 144: case 159: case 160: case 165: case 169: case 173: case 175: case 176: case 177: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: case 204: {
 
-#line  2647 "VBNET.ATG" 
+#line  2657 "VBNET.ATG" 
 			Expression val = null;
 			AssignmentOperatorType op;
 			
@@ -5605,25 +5682,25 @@ out resumeStatement);
 			                        la.kind == Tokens.Not   || la.kind == Tokens.Times;
 			
 			SimpleExpr(
-#line  2653 "VBNET.ATG" 
+#line  2663 "VBNET.ATG" 
 out expr);
-			if (StartOf(28)) {
+			if (StartOf(29)) {
 				AssignmentOperator(
-#line  2655 "VBNET.ATG" 
+#line  2665 "VBNET.ATG" 
 out op);
 				Expr(
-#line  2655 "VBNET.ATG" 
+#line  2665 "VBNET.ATG" 
 out val);
 
-#line  2655 "VBNET.ATG" 
+#line  2665 "VBNET.ATG" 
 				expr = new AssignmentExpression(expr, op, val); 
 			} else if (la.kind == 1 || la.kind == 13 || la.kind == 86) {
 
-#line  2656 "VBNET.ATG" 
+#line  2666 "VBNET.ATG" 
 				if (mustBeAssignment) Error("error in assignment."); 
-			} else SynErr(256);
+			} else SynErr(257);
 
-#line  2659 "VBNET.ATG" 
+#line  2669 "VBNET.ATG" 
 			// a field reference expression that stands alone is a
 			// invocation expression without parantheses and arguments
 			if(expr is FieldReferenceExpression || expr is IdentifierExpression) {
@@ -5636,64 +5713,37 @@ out val);
 		case 56: {
 			lexer.NextToken();
 			SimpleExpr(
-#line  2666 "VBNET.ATG" 
+#line  2676 "VBNET.ATG" 
 out expr);
 
-#line  2666 "VBNET.ATG" 
+#line  2676 "VBNET.ATG" 
 			statement = new StatementExpression(expr); 
 			break;
 		}
 		case 188: {
 			lexer.NextToken();
-			Identifier();
-
-#line  2668 "VBNET.ATG" 
-			string resourcename = t.val, typeName; 
-			Statement resourceAquisition = null, block = null;
-			
-			Expect(48);
-			if (la.kind == 127) {
-				lexer.NextToken();
-				Qualident(
-#line  2671 "VBNET.ATG" 
-out typeName);
-
-#line  2672 "VBNET.ATG" 
-				List<Expression> initializer = null; 
-				if (la.kind == 24) {
-					lexer.NextToken();
-					if (StartOf(20)) {
-						ArgumentList(
-#line  2673 "VBNET.ATG" 
-out initializer);
-					}
-					Expect(25);
-				}
 
-#line  2675 "VBNET.ATG" 
-				resourceAquisition =  new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName)));
-				
-				
-			} else if (StartOf(12)) {
-				Qualident(
 #line  2678 "VBNET.ATG" 
-out typeName);
-				Expect(11);
-				Expr(
-#line  2678 "VBNET.ATG" 
-out expr);
+			LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifier.None); 
 
+#line  2679 "VBNET.ATG" 
+			Statement block;  
+			VariableDeclarator(
 #line  2680 "VBNET.ATG" 
-				resourceAquisition =  new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName)));
-				
-			} else SynErr(257);
+resourceAquisition.Variables);
+			while (la.kind == 12) {
+				lexer.NextToken();
+				VariableDeclarator(
+#line  2682 "VBNET.ATG" 
+resourceAquisition.Variables);
+			}
 			Block(
-#line  2683 "VBNET.ATG" 
+#line  2684 "VBNET.ATG" 
 out block);
 			Expect(88);
 			Expect(188);
 
-#line  2685 "VBNET.ATG" 
+#line  2686 "VBNET.ATG" 
 			statement = new UsingStatement(resourceAquisition, block); 
 			break;
 		}
@@ -5702,10 +5752,10 @@ out block);
 	}
 
 	void LocalDeclarationStatement(
-#line  2387 "VBNET.ATG" 
+#line  2397 "VBNET.ATG" 
 out Statement statement) {
 
-#line  2389 "VBNET.ATG" 
+#line  2399 "VBNET.ATG" 
 		Modifiers m = new Modifiers();
 		LocalVariableDeclaration localVariableDeclaration;
 		bool dimfound = false;
@@ -5714,22 +5764,22 @@ out Statement statement) {
 			if (la.kind == 71) {
 				lexer.NextToken();
 
-#line  2395 "VBNET.ATG" 
+#line  2405 "VBNET.ATG" 
 				m.Add(Modifier.Const, t.Location); 
 			} else if (la.kind == 161) {
 				lexer.NextToken();
 
-#line  2396 "VBNET.ATG" 
+#line  2406 "VBNET.ATG" 
 				m.Add(Modifier.Static, t.Location); 
 			} else {
 				lexer.NextToken();
 
-#line  2397 "VBNET.ATG" 
+#line  2407 "VBNET.ATG" 
 				dimfound = true; 
 			}
 		}
 
-#line  2400 "VBNET.ATG" 
+#line  2410 "VBNET.ATG" 
 		if(dimfound && (m.Modifier & Modifier.Const) != 0) {
 		Error("Dim is not allowed on constants.");
 		}
@@ -5742,104 +5792,104 @@ out Statement statement) {
 		localVariableDeclaration.StartLocation = t.Location;
 		
 		VariableDeclarator(
-#line  2411 "VBNET.ATG" 
+#line  2421 "VBNET.ATG" 
 localVariableDeclaration.Variables);
 		while (la.kind == 12) {
 			lexer.NextToken();
 			VariableDeclarator(
-#line  2412 "VBNET.ATG" 
+#line  2422 "VBNET.ATG" 
 localVariableDeclaration.Variables);
 		}
 
-#line  2414 "VBNET.ATG" 
+#line  2424 "VBNET.ATG" 
 		statement = localVariableDeclaration;
 		
 	}
 
 	void TryStatement(
-#line  2878 "VBNET.ATG" 
+#line  2872 "VBNET.ATG" 
 out Statement tryStatement) {
 
-#line  2880 "VBNET.ATG" 
+#line  2874 "VBNET.ATG" 
 		Statement blockStmt = null, finallyStmt = null;List<CatchClause> catchClauses = null;
 		
 		Expect(174);
 		EndOfStmt();
 		Block(
-#line  2883 "VBNET.ATG" 
+#line  2877 "VBNET.ATG" 
 out blockStmt);
 		if (la.kind == 58 || la.kind == 88 || la.kind == 97) {
 			CatchClauses(
-#line  2884 "VBNET.ATG" 
+#line  2878 "VBNET.ATG" 
 out catchClauses);
 		}
 		if (la.kind == 97) {
 			lexer.NextToken();
 			EndOfStmt();
 			Block(
-#line  2885 "VBNET.ATG" 
+#line  2879 "VBNET.ATG" 
 out finallyStmt);
 		}
 		Expect(88);
 		Expect(174);
 
-#line  2888 "VBNET.ATG" 
+#line  2882 "VBNET.ATG" 
 		tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt);
 		
 	}
 
 	void WithStatement(
-#line  2856 "VBNET.ATG" 
+#line  2850 "VBNET.ATG" 
 out Statement withStatement) {
 
-#line  2858 "VBNET.ATG" 
+#line  2852 "VBNET.ATG" 
 		Statement blockStmt = null;
 		Expression expr = null;
 		
 		Expect(182);
 
-#line  2861 "VBNET.ATG" 
+#line  2855 "VBNET.ATG" 
 		Point start = t.Location; 
 		Expr(
-#line  2862 "VBNET.ATG" 
+#line  2856 "VBNET.ATG" 
 out expr);
 		EndOfStmt();
 
-#line  2864 "VBNET.ATG" 
+#line  2858 "VBNET.ATG" 
 		withStatement = new WithStatement(expr);
 		withStatement.StartLocation = start;
 		withStatements.Push(withStatement);
 		
 		Block(
-#line  2868 "VBNET.ATG" 
+#line  2862 "VBNET.ATG" 
 out blockStmt);
 
-#line  2870 "VBNET.ATG" 
+#line  2864 "VBNET.ATG" 
 		((WithStatement)withStatement).Body = (BlockStatement)blockStmt;
 		withStatements.Pop();
 		
 		Expect(88);
 		Expect(182);
 
-#line  2874 "VBNET.ATG" 
+#line  2868 "VBNET.ATG" 
 		withStatement.EndLocation = t.Location; 
 	}
 
 	void WhileOrUntil(
-#line  2849 "VBNET.ATG" 
+#line  2843 "VBNET.ATG" 
 out ConditionType conditionType) {
 
-#line  2850 "VBNET.ATG" 
+#line  2844 "VBNET.ATG" 
 		conditionType = ConditionType.None; 
 		if (la.kind == 181) {
 			lexer.NextToken();
 
-#line  2851 "VBNET.ATG" 
+#line  2845 "VBNET.ATG" 
 			conditionType = ConditionType.While; 
 		} else if (la.kind == 177) {
 			lexer.NextToken();
 
-#line  2852 "VBNET.ATG" 
+#line  2846 "VBNET.ATG" 
 			conditionType = ConditionType.Until; 
 		} else SynErr(259);
 	}
@@ -5879,59 +5929,53 @@ out type);
 		} else if (arrayModifiers != null) {
 			type.RankSpecifier = (int[])arrayModifiers.ToArray(typeof(int));
 		}
-		} else {
-			if (arrayModifiers != null) {
-				type = new TypeReference("Integer", (int[])arrayModifiers.ToArray(typeof(int)));
-			} else {
-				type = new TypeReference("Integer");
-			}
 		}
 		
 	}
 
 	void CaseClauses(
-#line  2809 "VBNET.ATG" 
+#line  2803 "VBNET.ATG" 
 out List<CaseLabel> caseClauses) {
 
-#line  2811 "VBNET.ATG" 
+#line  2805 "VBNET.ATG" 
 		caseClauses = new List<CaseLabel>();
 		CaseLabel caseClause = null;
 		
 		CaseClause(
-#line  2814 "VBNET.ATG" 
+#line  2808 "VBNET.ATG" 
 out caseClause);
 
-#line  2814 "VBNET.ATG" 
+#line  2808 "VBNET.ATG" 
 		if (caseClause != null) { caseClauses.Add(caseClause); } 
 		while (la.kind == 12) {
 			lexer.NextToken();
 			CaseClause(
-#line  2815 "VBNET.ATG" 
+#line  2809 "VBNET.ATG" 
 out caseClause);
 
-#line  2815 "VBNET.ATG" 
+#line  2809 "VBNET.ATG" 
 			if (caseClause != null) { caseClauses.Add(caseClause); } 
 		}
 	}
 
 	void OnErrorStatement(
-#line  2716 "VBNET.ATG" 
+#line  2710 "VBNET.ATG" 
 out OnErrorStatement stmt) {
 
-#line  2718 "VBNET.ATG" 
+#line  2712 "VBNET.ATG" 
 		stmt = null;
 		GotoStatement goToStatement = null;
 		
 		Expect(135);
 		Expect(92);
 		if (
-#line  2724 "VBNET.ATG" 
+#line  2718 "VBNET.ATG" 
 IsNegativeLabelName()) {
 			Expect(104);
 			Expect(15);
 			Expect(5);
 
-#line  2726 "VBNET.ATG" 
+#line  2720 "VBNET.ATG" 
 			long intLabel = Int64.Parse(t.val);
 			if(intLabel != 1) {
 				Error("invalid label in on error statement.");
@@ -5940,10 +5984,10 @@ IsNegativeLabelName()) {
 			
 		} else if (la.kind == 104) {
 			GotoStatement(
-#line  2732 "VBNET.ATG" 
+#line  2726 "VBNET.ATG" 
 out goToStatement);
 
-#line  2734 "VBNET.ATG" 
+#line  2728 "VBNET.ATG" 
 			string val = goToStatement.Label;
 			
 			// if value is numeric, make sure that is 0
@@ -5960,63 +6004,63 @@ out goToStatement);
 			lexer.NextToken();
 			Expect(128);
 
-#line  2748 "VBNET.ATG" 
+#line  2742 "VBNET.ATG" 
 			stmt = new OnErrorStatement(new ResumeStatement(true));
 			
 		} else SynErr(260);
 	}
 
 	void GotoStatement(
-#line  2754 "VBNET.ATG" 
+#line  2748 "VBNET.ATG" 
 out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) {
 
-#line  2756 "VBNET.ATG" 
+#line  2750 "VBNET.ATG" 
 		string label = String.Empty;
 		
 		Expect(104);
 		LabelName(
-#line  2759 "VBNET.ATG" 
+#line  2753 "VBNET.ATG" 
 out label);
 
-#line  2761 "VBNET.ATG" 
+#line  2755 "VBNET.ATG" 
 		goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label);
 		
 	}
 
 	void ResumeStatement(
-#line  2798 "VBNET.ATG" 
+#line  2792 "VBNET.ATG" 
 out ResumeStatement resumeStatement) {
 
-#line  2800 "VBNET.ATG" 
+#line  2794 "VBNET.ATG" 
 		resumeStatement = null;
 		string label = String.Empty;
 		
 		if (
-#line  2803 "VBNET.ATG" 
+#line  2797 "VBNET.ATG" 
 IsResumeNext()) {
 			Expect(153);
 			Expect(128);
 
-#line  2804 "VBNET.ATG" 
+#line  2798 "VBNET.ATG" 
 			resumeStatement = new ResumeStatement(true); 
 		} else if (la.kind == 153) {
 			lexer.NextToken();
-			if (StartOf(29)) {
+			if (StartOf(30)) {
 				LabelName(
-#line  2805 "VBNET.ATG" 
+#line  2799 "VBNET.ATG" 
 out label);
 			}
 
-#line  2805 "VBNET.ATG" 
+#line  2799 "VBNET.ATG" 
 			resumeStatement = new ResumeStatement(label); 
 		} else SynErr(261);
 	}
 
 	void CaseClause(
-#line  2819 "VBNET.ATG" 
+#line  2813 "VBNET.ATG" 
 out CaseLabel caseClause) {
 
-#line  2821 "VBNET.ATG" 
+#line  2815 "VBNET.ATG" 
 		Expression expr = null;
 		Expression sexpr = null;
 		BinaryOperatorType op = BinaryOperatorType.None;
@@ -6025,9 +6069,9 @@ out CaseLabel caseClause) {
 		if (la.kind == 86) {
 			lexer.NextToken();
 
-#line  2827 "VBNET.ATG" 
+#line  2821 "VBNET.ATG" 
 			caseClause = new CaseLabel(); 
-		} else if (StartOf(30)) {
+		} else if (StartOf(31)) {
 			if (la.kind == 113) {
 				lexer.NextToken();
 			}
@@ -6035,76 +6079,76 @@ out CaseLabel caseClause) {
 			case 27: {
 				lexer.NextToken();
 
-#line  2831 "VBNET.ATG" 
+#line  2825 "VBNET.ATG" 
 				op = BinaryOperatorType.LessThan; 
 				break;
 			}
 			case 26: {
 				lexer.NextToken();
 
-#line  2832 "VBNET.ATG" 
+#line  2826 "VBNET.ATG" 
 				op = BinaryOperatorType.GreaterThan; 
 				break;
 			}
 			case 30: {
 				lexer.NextToken();
 
-#line  2833 "VBNET.ATG" 
+#line  2827 "VBNET.ATG" 
 				op = BinaryOperatorType.LessThanOrEqual; 
 				break;
 			}
 			case 29: {
 				lexer.NextToken();
 
-#line  2834 "VBNET.ATG" 
+#line  2828 "VBNET.ATG" 
 				op = BinaryOperatorType.GreaterThanOrEqual; 
 				break;
 			}
 			case 11: {
 				lexer.NextToken();
 
-#line  2835 "VBNET.ATG" 
+#line  2829 "VBNET.ATG" 
 				op = BinaryOperatorType.Equality; 
 				break;
 			}
 			case 28: {
 				lexer.NextToken();
 
-#line  2836 "VBNET.ATG" 
+#line  2830 "VBNET.ATG" 
 				op = BinaryOperatorType.InEquality; 
 				break;
 			}
 			default: SynErr(262); break;
 			}
 			Expr(
-#line  2838 "VBNET.ATG" 
+#line  2832 "VBNET.ATG" 
 out expr);
 
-#line  2840 "VBNET.ATG" 
+#line  2834 "VBNET.ATG" 
 			caseClause = new CaseLabel(op, expr);
 			
-		} else if (StartOf(21)) {
+		} else if (StartOf(20)) {
 			Expr(
-#line  2842 "VBNET.ATG" 
+#line  2836 "VBNET.ATG" 
 out expr);
 			if (la.kind == 172) {
 				lexer.NextToken();
 				Expr(
-#line  2842 "VBNET.ATG" 
+#line  2836 "VBNET.ATG" 
 out sexpr);
 			}
 
-#line  2844 "VBNET.ATG" 
+#line  2838 "VBNET.ATG" 
 			caseClause = new CaseLabel(expr, sexpr);
 			
 		} else SynErr(263);
 	}
 
 	void CatchClauses(
-#line  2893 "VBNET.ATG" 
+#line  2887 "VBNET.ATG" 
 out List<CatchClause> catchClauses) {
 
-#line  2895 "VBNET.ATG" 
+#line  2889 "VBNET.ATG" 
 		catchClauses = new List<CatchClause>();
 		TypeReference type = null;
 		Statement blockStmt = null;
@@ -6116,27 +6160,27 @@ out List<CatchClause> catchClauses) {
 			if (StartOf(12)) {
 				Identifier();
 
-#line  2903 "VBNET.ATG" 
+#line  2897 "VBNET.ATG" 
 				name = t.val; 
 				if (la.kind == 48) {
 					lexer.NextToken();
 					TypeName(
-#line  2903 "VBNET.ATG" 
+#line  2897 "VBNET.ATG" 
 out type);
 				}
 			}
 			if (la.kind == 180) {
 				lexer.NextToken();
 				Expr(
-#line  2904 "VBNET.ATG" 
+#line  2898 "VBNET.ATG" 
 out expr);
 			}
 			EndOfStmt();
 			Block(
-#line  2906 "VBNET.ATG" 
+#line  2900 "VBNET.ATG" 
 out blockStmt);
 
-#line  2907 "VBNET.ATG" 
+#line  2901 "VBNET.ATG" 
 			catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); 
 		}
 	}
@@ -6420,29 +6464,29 @@ out blockStmt);
 			case 227: s = "invalid InterfaceMemberDecl"; break;
 			case 228: s = "invalid InterfaceMemberDecl"; break;
 			case 229: s = "invalid Charset"; break;
-			case 230: s = "invalid VariableDeclarator"; break;
-			case 231: s = "invalid AccessorDecls"; break;
-			case 232: s = "invalid EventAccessorDeclaration"; break;
-			case 233: s = "invalid OverloadableOperator"; break;
-			case 234: s = "invalid VariableInitializer"; break;
-			case 235: s = "invalid EventMemberSpecifier"; break;
+			case 230: s = "invalid IdentifierForFieldDeclaration"; break;
+			case 231: s = "invalid VariableDeclaratorPartAfterIdentifier"; break;
+			case 232: s = "invalid AccessorDecls"; break;
+			case 233: s = "invalid EventAccessorDeclaration"; break;
+			case 234: s = "invalid OverloadableOperator"; break;
+			case 235: s = "invalid VariableInitializer"; break;
 			case 236: s = "invalid EventMemberSpecifier"; break;
-			case 237: s = "invalid AssignmentOperator"; break;
-			case 238: s = "invalid SimpleExpr"; break;
+			case 237: s = "invalid EventMemberSpecifier"; break;
+			case 238: s = "invalid AssignmentOperator"; break;
 			case 239: s = "invalid SimpleExpr"; break;
 			case 240: s = "invalid SimpleExpr"; break;
-			case 241: s = "invalid PrimitiveTypeName"; break;
-			case 242: s = "invalid CastTarget"; break;
-			case 243: s = "invalid InvocationOrMemberReferenceExpression"; break;
-			case 244: s = "invalid InvocationExpression"; break;
+			case 241: s = "invalid SimpleExpr"; break;
+			case 242: s = "invalid PrimitiveTypeName"; break;
+			case 243: s = "invalid CastTarget"; break;
+			case 244: s = "invalid InvocationOrMemberReferenceExpression"; break;
 			case 245: s = "invalid InvocationExpression"; break;
-			case 246: s = "invalid Argument"; break;
-			case 247: s = "invalid QualIdentAndTypeArguments"; break;
-			case 248: s = "invalid AttributeArguments"; break;
-			case 249: s = "invalid ParameterModifier"; break;
-			case 250: s = "invalid Statement"; break;
-			case 251: s = "invalid LabelName"; break;
-			case 252: s = "invalid EmbeddedStatement"; break;
+			case 246: s = "invalid InvocationExpression"; break;
+			case 247: s = "invalid Argument"; break;
+			case 248: s = "invalid QualIdentAndTypeArguments"; break;
+			case 249: s = "invalid AttributeArguments"; break;
+			case 250: s = "invalid ParameterModifier"; break;
+			case 251: s = "invalid Statement"; break;
+			case 252: s = "invalid LabelName"; break;
 			case 253: s = "invalid EmbeddedStatement"; break;
 			case 254: s = "invalid EmbeddedStatement"; break;
 			case 255: s = "invalid EmbeddedStatement"; break;
@@ -6470,32 +6514,33 @@ out blockStmt);
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,T,x, x,x,x,x, x,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,T,x, x,x,x,x, T,x,x},
 	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, x,T,x,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,T,T,T, T,T,T,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,x,x, x,T,T,T, T,x,x,x, T,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x},
+	{x,T,T,T, T,T,T,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,x,x, x,T,T,T, T,x,x,x, T,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,T,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,T,T,T, T,T,T,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,x,x, x,T,T,T, T,x,x,x, x,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
-	{x,T,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
-	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
-	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
-	{x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
+	{x,T,T,T, T,T,T,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,x,x, x,T,T,T, T,x,x,x, x,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,T,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, T,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,x,x, x,T,T,T, T,x,x,x, T,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,T,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x},
+	{x,x,T,T, T,T,T,T, T,T,T,x, T,x,T,T, T,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x},
-	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
+	{x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,T, T,x,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,x,x, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,x, T,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,x,x,x, x,T,x,T, x,x,x,x, T,T,x,T, x,x,T,x, x,T,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,x,x},
+	{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
-	{x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
+	{x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x},
 	{x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}
 
 	};
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
index d88f3391ca..ea7291c436 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
+++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
@@ -19,12 +19,14 @@ public string ContainingAssembly
 }
 Token t
 {
+	[System.Diagnostics.DebuggerStepThrough]
 	get {
 		return lexer.Token;
 	}
 }
 Token la
 {
+	[System.Diagnostics.DebuggerStepThrough]
 	get {
 		return lexer.LookAhead;
 	}
@@ -957,9 +959,10 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 		Statement stmt = null;
 		List<VariableDeclaration> variableDeclarators = new List<VariableDeclaration>();
 		List<TemplateDefinition> templates = new List<TemplateDefinition>();
-	.)=
+	.)
+=
 	NonModuleDeclaration<m, attributes>
-	| /* 9.2.1 */
+| /* 9.2.1 */
 	"Sub"
 	(.
 		Point startPos = t.Location;
@@ -1038,7 +1041,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 			compilationUnit.AddChild(cd);
 		.)
 	)
-	|
+|
 	/* 9.2.1 */
 	"Function"
 	(.
@@ -1112,7 +1115,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 			.)
 			EOL
 	)
-	|
+|
 	/* 9.2.2. */
 	"Declare"
 	(.
@@ -1152,7 +1155,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 				compilationUnit.AddChild(declareDeclaration);
 			.)
 		)
-	|
+|
 	/* 9. 4 */
 	"Event"
 	(.
@@ -1176,14 +1179,15 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 		compilationUnit.AddChild(eventDeclaration);
 	.)
 	EOL
-	| /* 9.6 */
+| /* 9.6 */
 	(. Point startPos = t.Location; .)
 	(.
 		m.Check(Modifier.Fields);
 		FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier);
 		fd.StartLocation = m.GetDeclarationLocation(startPos); 
 	.)
-	VariableDeclarator<variableDeclarators>
+	IdentifierForFieldDeclaration (. string name = t.val; .)
+	VariableDeclaratorPartAfterIdentifier<variableDeclarators, name>
 	{ "," VariableDeclarator<variableDeclarators> }
 	EOL
 	(.
@@ -1210,7 +1214,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 		fd.EndLocation = t.EndLocation;
 		compilationUnit.AddChild(fd);
 	.)
-	| /* 9.7 */
+| /* 9.7 */
 	"Property"
 	(.
 		m.Check(Modifier.VBProperties);
@@ -1261,7 +1265,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 			compilationUnit.AddChild(pDecl);
 		.)
 	)
-	|
+|
 	"Custom" (. Point startPos = t.Location; .) "Event"
 	(.
 		m.Check(Modifier.VBCustomEvents);
@@ -1317,9 +1321,9 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 		decl.RaiseRegion = raiseEventAccessorDeclaration;
 		compilationUnit.AddChild(decl);
 	.)
-	|  (. ConversionType opConversionType = ConversionType.None; .)
-		[ "Widening"		(. opConversionType = ConversionType.Implicit; .)
-		| "Narrowing"		(. opConversionType = ConversionType.Explicit;.) ]
+|   (. ConversionType opConversionType = ConversionType.None; .)
+	[ "Widening"		(. opConversionType = ConversionType.Implicit; .)
+	| "Narrowing"		(. opConversionType = ConversionType.Explicit;.) ]
 	"Operator"
 	(.
 		m.Check(Modifier.VBOperators);
@@ -1363,7 +1367,7 @@ StructureMemberDecl<Modifiers m, List<AttributeSection> attributes>
 		operatorDeclaration.Body.EndLocation = t.Location;
 		compilationUnit.AddChild(operatorDeclaration);
 	.)
-	.
+.
 
 OverloadableOperator<out OverloadableOperatorType operatorType>
 	(. operatorType = OverloadableOperatorType.None; .)
@@ -1536,13 +1540,18 @@ ConstantDeclarator<List<VariableDeclaration> constantDeclaration>
 
 /* 9.6 */
 VariableDeclarator<List<VariableDeclaration> fieldDeclaration>
+=
+	Identifier (. string name = t.val; .)
+	VariableDeclaratorPartAfterIdentifier<fieldDeclaration, name>
+.
+
+VariableDeclaratorPartAfterIdentifier<List<VariableDeclaration> fieldDeclaration, string name>
 	(.
 		Expression expr = null;
 		TypeReference type = null;
 		ArrayList rank = null;
 		List<Expression> dimension = null;
 	.) =
-	Identifier (. string name = t.val; .)
 	[ IF(IsSize() && !IsDims()) ArrayInitializationModifier<out dimension> ]
 	[ IF(IsDims())              ArrayNameModifier<out rank> ]
 	(
@@ -1770,7 +1779,7 @@ SimpleExpr<out Expression pexpr>
 		|	/* 11.4.2 */ "(" Expr<out expr> ")" 				(. pexpr = new ParenthesizedExpression(expr); .)
 		|	/* 11.4.4 */ Identifier					(. pexpr = new IdentifierExpression(t.val); .)
 		|	(. string val = String.Empty; .)
-			PrimitiveTypeName<out val>
+			[ PrimitiveTypeName<out val> | "Object" (. val = "Object"; .) ]
 			"." (. t.val = ""; .) Identifier (. pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); .)
 		|	"Me"							(. pexpr = new ThisReferenceExpression(); .)
 		|	(. Expression retExpr = null; .)
@@ -2024,12 +2033,14 @@ ObjectCreateExpression<out Expression oce>
 	oce = null;
 .) =
 	"New" NonArrayTypeName<out type, false>
-	["(" [ ArgumentList<out arguments> ] ")" ]
-	[ IF (la.kind == Tokens.OpenParenthesis)
-	  ArrayTypeModifiers<out dimensions>
-	  ArrayInitializer<out initializer>
-	| ArrayInitializer<out initializer> ]
+	["(" ArgumentList<out arguments> ")"
+		[ IF (la.kind == Tokens.OpenParenthesis)
+		  ArrayTypeModifiers<out dimensions>
+		  ArrayInitializer<out initializer>
+		| ArrayInitializer<out initializer> ]
+	]
 	(.
+		if (type == null) type = new TypeReference("Object"); // fallback type on parser errors
 		if (initializer == null) {
 			oce = new ObjectCreateExpression(type, arguments);
 		} else {
@@ -2049,14 +2060,13 @@ ArgumentList<out List<Expression> arguments>
 		arguments = new List<Expression>();
 		Expression expr = null;
 	.) =
-	[
-		Argument<out expr>			(. if (expr != null) { arguments.Add(expr); } .)
-		{
-			","
-			Argument<out expr>		(. if (expr != null) { arguments.Add(expr); } .)
-		}
-	]
-	.
+	[ Argument<out expr> ]
+	{ "," (. arguments.Add(expr ?? Expression.Null); expr = null; .)
+		[ Argument<out expr> ]
+		(. if (expr == null) expr = Expression.Null; .)
+	}
+	(. if (expr != null) arguments.Add(expr); .)
+.
 
 /* Spec, 11.8 */
 Argument<out Expression argumentexpr>
@@ -2071,7 +2081,7 @@ Argument<out Expression argumentexpr>
 	.)
 	|
 	Expr<out argumentexpr>
-	.
+.
 
 /* 7.1. */
 TypeName<out TypeReference typeref>
@@ -2664,27 +2674,17 @@ EmbeddedStatement<out Statement statement>
 			statement = new StatementExpression(expr);
 		.)
 	| "Call" SimpleExpr<out expr> (. statement = new StatementExpression(expr); .)
-	| "Using" Identifier (. 
-		string resourcename = t.val, typeName; 
-		Statement resourceAquisition = null, block = null;
-	.) "As" (
-		"New" Qualident<out typeName>
-		(. List<Expression> initializer = null; .)
-		["(" [ ArgumentList<out initializer> ] ")" ]
-		(.  
-			resourceAquisition =  new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName)));
-			
-		.) |
-		Qualident<out typeName> "=" Expr<out expr> 
-		(.
-			resourceAquisition =  new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName)));
-		.) )
-		
+	| "Using"
+		(. LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifier.None); .)
+		(. Statement block;  .)
+		VariableDeclarator<resourceAquisition.Variables>
+		{ ","
+		  VariableDeclarator<resourceAquisition.Variables>
+		}
 		Block<out block>
 		"End" "Using"
 		(. statement = new UsingStatement(resourceAquisition, block); .)
-		
-	.
+.
 
 /* 10.9.2 */
 LoopControlVariable<out TypeReference type, out string name>
@@ -2702,12 +2702,6 @@ LoopControlVariable<out TypeReference type, out string name>
 			} else if (arrayModifiers != null) {
 				type.RankSpecifier = (int[])arrayModifiers.ToArray(typeof(int));
 			}
-		} else {
-			if (arrayModifiers != null) {
-				type = new TypeReference("Integer", (int[])arrayModifiers.ToArray(typeof(int)));
-			} else {
-				type = new TypeReference("Integer");
-			}
 		}
 	.)
 .
@@ -2927,13 +2921,28 @@ Identifier	=
 	| "Text"
 	| "Binary"
 	| "Compare"
+	| "Custom"
 	| "Assembly"
 	| "Ansi"
 	| "Auto"
 	| "Preserve"
 	| "Unicode"
 	| "Until"
-	.
+.
+
+IdentifierForFieldDeclaration =
+	ident
+	| "Text"
+	| "Binary"
+	| "Compare"
+	/*| "Custom" Custom is not valid for field declaration */
+	| "Assembly"
+	| "Ansi"
+	| "Auto"
+	| "Preserve"
+	| "Unicode"
+	| "Until"
+.
 
 /* 2.2 */
 
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs
index 0512d3c653..e7e096f252 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs
@@ -30,8 +30,6 @@ namespace ICSharpCode.NRefactory.Parser
 		//   Override Finalize => Destructor
 		//   IIF(cond, true, false) => ConditionalExpression
 		//   Built-in methods => Prefix with class name
-		
-		// The following conversions should be implemented in the future:
 		//   Function A() \n A = SomeValue \n End Function -> convert to return statement
 		
 		Dictionary<string, string> usings;
@@ -192,17 +190,125 @@ namespace ICSharpCode.NRefactory.Parser
 				}
 			}
 			
+			if (methodDeclaration.TypeReference.SystemType != "System.Void" && methodDeclaration.Body.Children.Count > 0) {
+				if (IsAssignmentTo(methodDeclaration.Body.Children[methodDeclaration.Body.Children.Count - 1], methodDeclaration.Name))
+				{
+					ReturnStatement rs = new ReturnStatement(GetAssignmentFromStatement(methodDeclaration.Body.Children[methodDeclaration.Body.Children.Count - 1]).Right);
+					methodDeclaration.Body.Children.RemoveAt(methodDeclaration.Body.Children.Count - 1);
+					methodDeclaration.Body.AddChild(rs);
+				} else {
+					methodDeclaration.Body.AcceptVisitor(new ReturnStatementForFunctionAssignment(methodDeclaration.Name), null);
+					Expression init;
+					switch (methodDeclaration.TypeReference.SystemType) {
+						case "System.Int16":
+						case "System.Int32":
+						case "System.Int64":
+						case "System.Byte":
+						case "System.UInt16":
+						case "System.UInt32":
+						case "System.UInt64":
+							init = new PrimitiveExpression(0, "0");
+							break;
+						case "System.Boolean":
+							init = new PrimitiveExpression(false, "false");
+							break;
+						default:
+							init = new PrimitiveExpression(null, "null");
+							break;
+					}
+					methodDeclaration.Body.Children.Insert(0, new LocalVariableDeclaration(new VariableDeclaration(FunctionReturnValueName, init, methodDeclaration.TypeReference)));
+					methodDeclaration.Body.Children[0].Parent = methodDeclaration.Body;
+					methodDeclaration.Body.AddChild(new ReturnStatement(new IdentifierExpression(FunctionReturnValueName)));
+				}
+			}
+			
 			return base.Visit(methodDeclaration, data);
 		}
 		
+		public const string FunctionReturnValueName = "functionReturnValue";
+		
+		static AssignmentExpression GetAssignmentFromStatement(INode statement)
+		{
+			StatementExpression se = statement as StatementExpression;
+			if (se == null) return null;
+			return se.Expression as AssignmentExpression;
+		}
+		
+		static bool IsAssignmentTo(INode statement, string varName)
+		{
+			AssignmentExpression ass = GetAssignmentFromStatement(statement);
+			if (ass == null) return false;
+			IdentifierExpression ident = ass.Left as IdentifierExpression;
+			if (ident == null) return false;
+			return ident.Identifier.Equals(varName, StringComparison.InvariantCultureIgnoreCase);
+		}
+		
+		#region Create return statement for assignment to function name
+		class ReturnStatementForFunctionAssignment : AbstractAstTransformer
+		{
+			string functionName;
+			
+			public ReturnStatementForFunctionAssignment(string functionName)
+			{
+				this.functionName = functionName;
+			}
+			
+			public override object Visit(AssignmentExpression assignmentExpression, object data)
+			{
+				IdentifierExpression ident = assignmentExpression.Left as IdentifierExpression;
+				if (ident != null) {
+					if (ident.Identifier.Equals(functionName, StringComparison.InvariantCultureIgnoreCase)) {
+						ident.Identifier = FunctionReturnValueName;
+					}
+				}
+				return base.Visit(assignmentExpression, data);
+			}
+		}
+		#endregion
+		
+		public override object Visit(FieldDeclaration fieldDeclaration, object data)
+		{
+			fieldDeclaration.Modifier &= ~Modifier.Dim; // remove "Dim" flag
+			return base.Visit(fieldDeclaration, data);
+		}
+		
 		public override object Visit(PropertyDeclaration propertyDeclaration, object data)
 		{
 			if ((propertyDeclaration.Modifier & Modifier.Visibility) == 0)
 				propertyDeclaration.Modifier = Modifier.Public;
 			
+			if (propertyDeclaration.HasSetRegion) {
+				string from = "Value";
+				if (propertyDeclaration.SetRegion.Parameters.Count > 0) {
+					ParameterDeclarationExpression p = propertyDeclaration.SetRegion.Parameters[0];
+					from = p.ParameterName;
+					p.ParameterName = "Value";
+				}
+				propertyDeclaration.SetRegion.AcceptVisitor(new RenameIdentifierVisitor(from, "value"), null);
+			}
+			
 			return base.Visit(propertyDeclaration, data);
 		}
 		
+		class RenameIdentifierVisitor : AbstractAstVisitor
+		{
+			string from, to;
+			
+			public RenameIdentifierVisitor(string from, string to)
+			{
+				this.from = from;
+				this.to = to;
+			}
+			
+			public override object Visit(IdentifierExpression identifierExpression, object data)
+			{
+				if (string.Equals(identifierExpression.Identifier, from, StringComparison.InvariantCultureIgnoreCase)) {
+					identifierExpression.Identifier = to;
+				}
+				return base.Visit(identifierExpression, data);
+			}
+		}
+		
 		static volatile Dictionary<string, Expression> constantTable;
 		static volatile Dictionary<string, Expression> methodTable;
 		
@@ -288,5 +394,21 @@ namespace ICSharpCode.NRefactory.Parser
 			}
 			return null;
 		}
+		
+		public override object Visit(UsingStatement usingStatement, object data)
+		{
+			LocalVariableDeclaration lvd = usingStatement.ResourceAcquisition as LocalVariableDeclaration;
+			if (lvd != null && lvd.Variables.Count > 1) {
+				usingStatement.ResourceAcquisition = new LocalVariableDeclaration(lvd.Variables[0]);
+				for (int i = 1; i < lvd.Variables.Count; i++) {
+					UsingStatement n = new UsingStatement(new LocalVariableDeclaration(lvd.Variables[i]),
+					                                      usingStatement.EmbeddedStatement);
+					usingStatement.EmbeddedStatement = new BlockStatement();
+					usingStatement.EmbeddedStatement.AddChild(n);
+					usingStatement = n;
+				}
+			}
+			return base.Visit(usingStatement, data);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/General/UnitTest.cs b/src/Libraries/NRefactory/Test/General/UnitTest.cs
index 850505f066..e594abc308 100644
--- a/src/Libraries/NRefactory/Test/General/UnitTest.cs
+++ b/src/Libraries/NRefactory/Test/General/UnitTest.cs
@@ -29,11 +29,29 @@ namespace ICSharpCode.NRefactory.Tests
 			}
 		}
 		
+		[Test]
+		public void TestUnitTests()
+		{
+			Type[] allTypes = typeof(StructuralTest).Assembly.GetTypes();
+			
+			foreach (Type type in allTypes) {
+				if (type.GetCustomAttributes(typeof(TestFixtureAttribute), true).Length > 0) {
+					foreach (MethodInfo m in type.GetMethods()) {
+						if (m.IsPublic && m.ReturnType == typeof(void) && m.GetParameters().Length == 0) {
+							if (m.GetCustomAttributes(typeof(TestAttribute), true).Length == 0) {
+								Assert.Fail(type.Name + "." + m.Name + " should have the [Test] attribute!");
+							}
+						}
+					}
+				}
+			}
+		}
+		
 //		[Test]
 //		public void TestAcceptVisitorMethods()
 //		{
 //			Type[] allTypes = typeof(AbstractNode).Assembly.GetTypes();
-//			
+//
 //			foreach (Type type in allTypes) {
 //				if (type.IsClass && !type.IsAbstract && type.GetInterface(typeof(INode).FullName) != null) {
 //					MethodInfo methodInfo = type.GetMethod("AcceptVisitor", BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public);
diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs
index 1d41a7394e..6e58db722a 100644
--- a/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs
+++ b/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs
@@ -146,6 +146,43 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			           "public object A {\n\tget {\n\t\treturn null;\n\t}\n}");
 		}
 		
+		[Test]
+		public void ValueInPropertySetter()
+		{
+			TestMember("WriteOnly Property A()\nSet\nDim x As Object = Value\nEnd Set\nEnd Property",
+			           "public object A {\n\tset {\n\t\tobject x = value;\n\t}\n}");
+		}
+		
+		[Test]
+		public void ValueInPropertySetter2()
+		{
+			TestMember("WriteOnly Property A()\nSet(ByVal otherName)\nDim x As Object = otherName\nEnd Set\nEnd Property",
+			           "public object A {\n\tset {\n\t\tobject x = value;\n\t}\n}");
+		}
+		
+		[Test]
+		public void FieldDeclaredWithDim()
+		{
+			TestMember("Dim f as String",
+			           "string f;");
+		}
+		
+		[Test]
+		public void MultipleFields()
+		{
+			TestMember("Private example, test As Single",
+			           "private float example;\n" +
+			           "private float test;");
+		}
+		
+		[Test]
+		public void MultipleVariables()
+		{
+			TestStatement("Dim example, test As Single",
+			              "float example;\n" +
+			              "float test;");
+		}
+		
 		[Test]
 		public void PInvoke()
 		{
@@ -246,11 +283,138 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			              "x = \"Hello \" + \"World\";");
 		}
 		
+		[Test]
+		public void IntegerDivision()
+		{
+			TestStatement(@"x = x \ b",
+			              "x = x / b;");
+			TestStatement(@"x \= b",
+			              "x /= b;");
+		}
+		
 		[Test]
 		public void VBConstants()
 		{
 			TestStatement("a = vbYesNo",
 			              "a = Constants.vbYesNo;");
 		}
+		
+		[Test]
+		public void ForNextLoop()
+		{
+			TestStatement("For i = 0 To 10\n" +
+			              "Next",
+			              "for (i = 0; i <= 10; i++) {\n" +
+			              "}");
+			TestStatement("For l As Long = 0 To 10 Step 2\n" +
+			              "Next",
+			              "for (long l = 0; l <= 10; l += 2) {\n" +
+			              "}");
+			TestStatement("For l As Long = 10 To 0 Step -1\n" +
+			              "Next",
+			              "for (long l = 10; l >= 0; l += -1) {\n" +
+			              "}");
+		}
+		
+		[Test]
+		public void DoLoop()
+		{
+			TestStatement("Do \n Loop",
+			              "do {\n" +
+			              "}\n" +
+			              "while (true);");
+			TestStatement("Do \n Loop Until i = 10000",
+			              "do {\n" +
+			              "}\n" +
+			              "while (!(i == 10000));");
+		}
+		
+		[Test]
+		public void UsingStatement()
+		{
+			TestStatement("Using r1 As New StreamReader(file1), r2 As New StreamReader(file2)\n" +
+			              "End Using",
+			              "using (StreamReader r1 = new StreamReader(file1)) {\n" +
+			              "\tusing (StreamReader r2 = new StreamReader(file2)) {\n" +
+			              "\t}\n" +
+			              "}");
+		}
+		
+		[Test]
+		public void SwitchStatement()
+		{
+			TestStatement(@"Select Case i
+                  Case 0 To 5
+                        i = 10
+                  Case 11
+                        i = 0
+                  Case Else
+                        i = 9
+            End Select",
+			              "switch (i) {\n" +
+			              "\tcase 0:\n" +
+			              "\tcase 1:\n" +
+			              "\tcase 2:\n" +
+			              "\tcase 3:\n" +
+			              "\tcase 4:\n" +
+			              "\tcase 5:\n" +
+			              "\t\ti = 10;\n" +
+			              "\t\tbreak;\n" +
+			              "\tcase 11:\n" +
+			              "\t\ti = 0;\n" +
+			              "\t\tbreak;\n" +
+			              "\tdefault:\n" +
+			              "\t\ti = 9;\n" +
+			              "\t\tbreak;\n" +
+			              "}");
+		}
+		
+		[Test]
+		public void FunctionWithImplicitReturn()
+		{
+			TestMember("Public Function run(i As Integer) As Integer\n" +
+			           " run = 0\n" +
+			           "End Function",
+			           "public int run(int i)\n" +
+			           "{\n" +
+			           "\treturn 0;\n" +
+			           "}");
+		}
+		
+		[Test]
+		public void FunctionWithImplicitReturn2()
+		{
+			TestMember("Public Function run(i As Integer) As Integer\n" +
+			           " While something\n" +
+			           "   run += i\n" +
+			           " End While\n" +
+			           "End Function",
+			           "public int run(int i)\n" +
+			           "{\n" +
+			           "\tint " + VBNetConstructsConvertVisitor.FunctionReturnValueName + " = 0;\n" +
+			           "\twhile (something) {\n" +
+			           "\t\t" + VBNetConstructsConvertVisitor.FunctionReturnValueName + " += i;\n" +
+			           "\t}\n" +
+			           "\treturn " + VBNetConstructsConvertVisitor.FunctionReturnValueName + ";\n" +
+			           "}");
+		}
+		
+		[Test]
+		public void FunctionWithImplicitReturn3()
+		{
+			TestMember("Public Function run(i As Integer) As CustomType\n" +
+			           " While something\n" +
+			           "   run = New CustomType()\n" +
+			           " End While\n" +
+			           "End Function",
+			           "public CustomType run(int i)\n" +
+			           "{\n" +
+			           "\tCustomType " + VBNetConstructsConvertVisitor.FunctionReturnValueName + " = null;\n" +
+			           "\twhile (something) {\n" +
+			           "\t\t" + VBNetConstructsConvertVisitor.FunctionReturnValueName + " = new CustomType();\n" +
+			           "\t}\n" +
+			           "\treturn " + VBNetConstructsConvertVisitor.FunctionReturnValueName + ";\n" +
+			           "}");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Output/SpecialOutputVisitor.cs b/src/Libraries/NRefactory/Test/Output/SpecialOutputVisitor.cs
index bad08317d5..3533f2a840 100644
--- a/src/Libraries/NRefactory/Test/Output/SpecialOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Test/Output/SpecialOutputVisitor.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 				outputVisitor.Visit(parser.CompilationUnit, null);
 			}
 			Assert.AreEqual("", outputVisitor.Errors.ErrorOutput);
-			Assert.AreEqual(program, outputVisitor.Text.TrimEnd().Replace("\r", ""));
+			Assert.AreEqual(program.Replace("\r", ""), outputVisitor.Text.TrimEnd().Replace("\r", ""));
 			parser.Dispose();
 		}
 		
@@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 				outputVisitor.Visit(parser.CompilationUnit, null);
 			}
 			Assert.AreEqual("", outputVisitor.Errors.ErrorOutput);
-			Assert.AreEqual(program, outputVisitor.Text.TrimEnd().Replace("\r", ""));
+			Assert.AreEqual(program.Replace("\r", ""), outputVisitor.Text.TrimEnd().Replace("\r", ""));
 			parser.Dispose();
 		}
 		
@@ -97,13 +97,41 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 		public void EnumVB()
 		{
 			TestProgramVB("Enum Test\n" +
-			            "\t' a\n" +
-			            "\tm1\n" +
-			            "\t' b\n" +
-			            "\tm2\n" +
-			            "\t' c\n" +
-			            "End Enum\n" +
-			            "' d");
+			              "\t' a\n" +
+			              "\tm1\n" +
+			              "\t' b\n" +
+			              "\tm2\n" +
+			              "\t' c\n" +
+			              "End Enum\n" +
+			              "' d");
+		}
+		
+		[Test]
+		public void RegionInsideMethod()
+		{
+			TestProgram(@"public class Class1
+{
+	private bool test(int l, int lvw)
+	{
+		#region Metodos Auxiliares
+		int i = 1;
+		return false;
+		#endregion
+	}
+}");
+		}
+		
+		[Test]
+		public void RegionInsideMethodVB()
+		{
+			TestProgramVB(@"Public Class Class1
+	Private Function test(ByVal l As Integer, ByVal lvw As Integer) As Boolean
+		' Begin
+		Dim i As Integer = 1
+		Return False
+		' End of method
+	End Function
+End Class");
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Output/VBNet/CSharpToVBConverterTest.cs b/src/Libraries/NRefactory/Test/Output/VBNet/CSharpToVBConverterTest.cs
index 8ada95d169..017adf5410 100644
--- a/src/Libraries/NRefactory/Test/Output/VBNet/CSharpToVBConverterTest.cs
+++ b/src/Libraries/NRefactory/Test/Output/VBNet/CSharpToVBConverterTest.cs
@@ -71,6 +71,42 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			            "End Namespace\r\n");
 		}
 		
+		[Test]
+		public void ClassImplementsInterface()
+		{
+			TestProgram("class test : IComparable { }",
+			            "Class test\r\n" +
+			            "\tImplements IComparable\r\n" +
+			            "End Class\r\n");
+		}
+		
+		[Test]
+		public void ClassImplementsInterface2()
+		{
+			TestProgram("class test : System.IComparable { }",
+			            "Class test\r\n" +
+			            "\tImplements System.IComparable\r\n" +
+			            "End Class\r\n");
+		}
+		
+		[Test]
+		public void ClassInheritsClass()
+		{
+			TestProgram("class test : InvalidDataException { }",
+			            "Class test\r\n" +
+			            "\tInherits InvalidDataException\r\n" +
+			            "End Class\r\n");
+		}
+		
+		[Test]
+		public void ClassInheritsClass2()
+		{
+			TestProgram("class test : System.IO.InvalidDataException { }",
+			            "Class test\r\n" +
+			            "\tInherits System.IO.InvalidDataException\r\n" +
+			            "End Class\r\n");
+		}
+		
 		[Test]
 		public void ForWithUnknownConditionAndSingleStatement()
 		{
@@ -293,5 +329,21 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			           "\tNext\n" +
 			           "End Sub");
 		}
+		
+		[Test]
+		public void NullCoalescing()
+		{
+			TestStatement("c = a ?? b;",
+			              "c = IIf(a Is Nothing, b, a)");
+		}
+		
+		[Test]
+		public void ConvertedLoop()
+		{
+			TestStatement("while (cond) example();",
+			              "While cond\n" +
+			              "\texample()\n" +
+			              "End While");
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs b/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs
index 43a851457d..d667473ed2 100644
--- a/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs
+++ b/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs
@@ -78,6 +78,12 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			TestProgram("Public Partial Class Foo\nEnd Class");
 		}
 		
+		[Test]
+		public void MustInheritClass()
+		{
+			TestProgram("Public MustInherit Class Foo\nEnd Class");
+		}
+		
 		[Test]
 		public void GenericClassDefinition()
 		{
@@ -106,6 +112,14 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 		public void ArrayInitialization()
 		{
 			TestStatement("Dim a As Object() = New Object(10) {}");
+			TestTypeMember("Private MultiDim As Integer(,) = {{1, 2}, {1, 3}}");
+			TestExpression("New Integer(, ) {{1, 1}, {1, 1}}");
+		}
+		
+		[Test]
+		public void MethodCallWithOptionalArguments()
+		{
+			TestExpression("M(, )");
 		}
 		
 		[Test]
@@ -120,6 +134,54 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 			              "End If");
 		}
 		
+		[Test]
+		public void ForNextLoop()
+		{
+			TestStatement("For i = 0 To 10\n" +
+			              "Next");
+			TestStatement("For i As Long = 10 To 0 Step -1\n" +
+			              "Next");
+		}
+		
+		[Test]
+		public void DoLoop()
+		{
+			TestStatement("Do\n" +
+			              "Loop");
+			TestStatement("Do\n" +
+			              "Loop While Not (i = 10)");
+		}
+		
+		[Test]
+		public void SelectCase()
+		{
+			TestStatement(@"Select Case i
+	Case 0
+	Case 1 To 4
+	Case Else
+End Select");
+		}
+		
+		[Test]
+		public void UsingStatement()
+		{
+			TestStatement(@"Using nf As New Font(), nf2 As New List(Of Font)(), nf3 = Nothing
+	Bla(nf)
+End Using");
+		}
+		
+		[Test]
+		public void UntypedVariable()
+		{
+			TestStatement("Dim x = 0");
+		}
+		
+		[Test]
+		public void UntypedField()
+		{
+			TestTypeMember("Dim x = 0");
+		}
+		
 		[Test]
 		public void Assignment()
 		{
@@ -130,7 +192,8 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 		public void SpecialIdentifiers()
 		{
 			// Assembly, Ansi and Until are contextual keywords
-			TestExpression("Assembly = Ansi * [For] + Until");
+			// Custom is valid inside methods, but not valid for field names
+			TestExpression("Assembly = Ansi * [For] + Until - [Custom]");
 		}
 		
 		[Test]
@@ -178,7 +241,7 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter
 		[Test]
 		public void Using()
 		{
-			TestStatement("Using a As A = New A()\na.Work()\nEnd Using");
+			TestStatement("Using a As New A()\na.Work()\nEnd Using");
 		}
 		
 		[Test]
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs
index e891f63c88..11e6543a33 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs
@@ -28,6 +28,7 @@ namespace ICSharpCode.NRefactory.Tests.AST
 		#endregion
 		
 		#region VB.NET
+		
 		[Test]
 		public void VBNetArrayCreateExpressionTest1()
 		{
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/DefaultValueExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/DefaultValueExpressionTests.cs
index 1908998ac8..ce9893341c 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/DefaultValueExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/DefaultValueExpressionTests.cs
@@ -26,7 +26,8 @@ namespace ICSharpCode.NRefactory.Tests.AST
 		[Test]
 		public void CSharpFullQualifiedDefaultValue()
 		{
-			DefaultValueExpression toe = ParseUtilCSharp.ParseExpression<DefaultValueExpression>("default(MyNamespace.N1.MyType)");
+			DefaultValueExpression toe = ParseUtilCSharp.ParseExpression<DefaultValueExpression>("default(global::MyNamespace.N1.MyType)");
+			Assert.IsTrue(toe.TypeReference.IsGlobal);
 			Assert.AreEqual("MyNamespace.N1.MyType", toe.TypeReference.Type);
 		}
 		
@@ -46,5 +47,13 @@ namespace ICSharpCode.NRefactory.Tests.AST
 			DefaultValueExpression dve = (DefaultValueExpression)lvd.Variables[0].Initializer;
 			Assert.AreEqual("T", dve.TypeReference.Type);
 		}
+		
+		[Test]
+		public void CSharpDefaultValueInReturnStatement()
+		{
+			ReturnStatement rs = ParseUtilCSharp.ParseStatement<ReturnStatement>("return default(T);");
+			DefaultValueExpression dve = (DefaultValueExpression)rs.Expression;
+			Assert.AreEqual("T", dve.TypeReference.Type);
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs
index 4aa5e00096..c4d08be7f5 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs
@@ -50,10 +50,9 @@ namespace ICSharpCode.NRefactory.Tests.AST
 		[Test]
 		public void VBNetAssemblyIdentifierExpressionTest()
 		{
-			IdentifierExpression ie = ParseUtilVBNet.ParseExpression<IdentifierExpression>("Assembly");
-			Assert.AreEqual("Assembly", ie.Identifier);
+			Assert.AreEqual("Assembly", ParseUtilVBNet.ParseExpression<IdentifierExpression>("Assembly").Identifier);
+			Assert.AreEqual("Custom", ParseUtilVBNet.ParseExpression<IdentifierExpression>("Custom").Identifier);
 		}
 		#endregion
-		
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/TypeReferenceExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/TypeReferenceExpressionTests.cs
index 80f596d4c8..6196975d8c 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/TypeReferenceExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/TypeReferenceExpressionTests.cs
@@ -81,7 +81,25 @@ namespace ICSharpCode.NRefactory.Tests.AST
 			Assert.AreEqual("", fre.FieldName);
 			Assert.AreEqual("System.Int32", ((TypeReferenceExpression)fre.TargetObject).TypeReference.SystemType);
 		}
-		#endregion
 		
+		[Test]
+		public void VBObjectReferenceExpression()
+		{
+			FieldReferenceExpression fre = ParseUtilVBNet.ParseExpression<FieldReferenceExpression>("Object.ReferenceEquals");
+			Assert.AreEqual("ReferenceEquals", fre.FieldName);
+			Assert.AreEqual("System.Object", ((TypeReferenceExpression)fre.TargetObject).TypeReference.SystemType);
+		}
+		
+		[Test]
+		public void VBStandaloneObjectReferenceExpression()
+		{
+			// this is propably not what really should be returned for a standalone int
+			// reference, but it has to stay consistent because NRefactoryResolver depends
+			// on this trick.
+			FieldReferenceExpression fre = ParseUtilVBNet.ParseExpression<FieldReferenceExpression>("obJeCt", true);
+			Assert.AreEqual("", fre.FieldName);
+			Assert.AreEqual("System.Object", ((TypeReferenceExpression)fre.TargetObject).TypeReference.SystemType);
+		}
+		#endregion
 	}
 }
diff --git a/src/Libraries/NRefactory/Test/Parser/Statements/UsingStatementTests.cs b/src/Libraries/NRefactory/Test/Parser/Statements/UsingStatementTests.cs
index 07f333bf99..afa96022df 100644
--- a/src/Libraries/NRefactory/Test/Parser/Statements/UsingStatementTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Statements/UsingStatementTests.cs
@@ -43,6 +43,16 @@ End Using";
 			string usingText = @"
 Using nf As Font = New Font()
 	Bla(nf)
+End Using";
+			UsingStatement usingStmt = ParseUtilVBNet.ParseStatement<UsingStatement>(usingText);
+			// TODO : Extend test.
+		}
+		[Test]
+		public void VBNetUsingStatementTest3()
+		{
+			string usingText = @"
+Using nf As New Font(), nf2 As New List(Of Font)(), nf3 = Nothing
+	Bla(nf)
 End Using";
 			UsingStatement usingStmt = ParseUtilVBNet.ParseStatement<UsingStatement>(usingText);
 			// TODO : Extend test.
diff --git a/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs b/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs
index 817f5c9e08..58a96921e4 100644
--- a/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs
+++ b/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs
@@ -71,8 +71,10 @@ namespace ICSharpCode.SharpDevelop.Commands
 				case "TaskService.Messages":
 					return TaskService.GetCount(TaskType.Message).ToString();
 				case "CurrentProjectName":
-					// TODO: Translate "<empty>"!!!!
-					return ProjectService.CurrentProject == null ? "<empty>" : ProjectService.CurrentProject.Name;
+					if (ProjectService.CurrentProject == null)
+						return "<no current project>";
+					else
+						return ProjectService.CurrentProject.Name;
 					
 			}
 			switch (tag.ToUpperInvariant()) {
diff --git a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
index a8cd8238d3..124cfae109 100644
--- a/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/ProjectMenuCommands.cs
@@ -42,8 +42,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 				ProjectOptionsView projectOptions = new ProjectOptionsView(projectOptionsNode, project);
 				WorkbenchSingleton.Workbench.ShowView(projectOptions);
 			} catch (TreePathNotFoundException) {
-				// TODO: Translate me!
-				MessageService.ShowError("No installed project options panels were found.");
+				MessageService.ShowError("${res:Dialog.ProjectOptions.NoPanelsInstalledForProject}");
 			}
 		}
 	}
diff --git a/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs b/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs
index 7938c046b4..1933e31619 100644
--- a/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs
+++ b/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs
@@ -36,7 +36,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 				p.Parse();
 
 				if (p.Errors.count > 0) {
-					MessageService.ShowError("Correct source code errors first (only correct source code would convert).");
+					MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Commands.Convert.CorrectSourceCodeErrors}\n" + p.Errors.ErrorOutput);
 					return;
 				}
 				ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor output = new ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor();
diff --git a/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs b/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs
index 6e2e99b02d..abf38ace8c 100644
--- a/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs
+++ b/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs
@@ -36,8 +36,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 				ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(SupportedLanguage.CSharp, new StringReader(((IEditable)window.ViewContent).Text));
 				p.Parse();
 				if (p.Errors.count > 0) {
-					
-					MessageService.ShowError("Correct source code errors first (only correct source code would convert).");
+					MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Commands.Convert.CorrectSourceCodeErrors}\n" + p.Errors.ErrorOutput);
 					return;
 				}
 				
diff --git a/src/Main/Base/Project/Src/Dom/ClassFinder.cs b/src/Main/Base/Project/Src/Dom/ClassFinder.cs
index 2c746065c1..ae85b3e77e 100644
--- a/src/Main/Base/Project/Src/Dom/ClassFinder.cs
+++ b/src/Main/Base/Project/Src/Dom/ClassFinder.cs
@@ -55,6 +55,8 @@ namespace ICSharpCode.SharpDevelop.Dom
 			this.callingClass = callingClass;
 			this.cu = callingClass.CompilationUnit;
 			this.projectContent = cu.ProjectContent;
+			if (projectContent == null)
+				throw new ArgumentException("callingClass must have a project content!");
 		}
 		
 		// currently callingMember is not required
@@ -78,6 +80,8 @@ namespace ICSharpCode.SharpDevelop.Dom
 			} else {
 				projectContent = ParserService.CurrentProjectContent;
 			}
+			if (projectContent == null)
+				throw new ArgumentException("projectContent not found!");
 		}
 		
 		public IClass GetClass(string fullName, int typeParameterCount)
diff --git a/src/Main/Base/Project/Src/Dom/Implementations/DefaultCompilationUnit.cs b/src/Main/Base/Project/Src/Dom/Implementations/DefaultCompilationUnit.cs
index e3e7fba7b3..3cb350e61b 100644
--- a/src/Main/Base/Project/Src/Dom/Implementations/DefaultCompilationUnit.cs
+++ b/src/Main/Base/Project/Src/Dom/Implementations/DefaultCompilationUnit.cs
@@ -29,12 +29,15 @@ namespace ICSharpCode.SharpDevelop.Dom
 		string fileName          = null;
 		IProjectContent projectContent;
 		
+		/// <summary>
+		/// Source code file this compilation unit was created from. For compiled are compiler-generated
+		/// code, this property returns null.
+		/// </summary>
 		public string FileName {
 			get {
 				return fileName;
 			}
 			set {
-				Debug.Assert(value != null);
 				fileName = value;
 			}
 		}
diff --git a/src/Main/Base/Project/Src/Gui/Components/SideBar/AxSideBar.cs b/src/Main/Base/Project/Src/Gui/Components/SideBar/AxSideBar.cs
index b95b791352..ae65e93797 100644
--- a/src/Main/Base/Project/Src/Gui/Components/SideBar/AxSideBar.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/SideBar/AxSideBar.cs
@@ -912,8 +912,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 			protected override void OnMouseDown(MouseEventArgs e)
 			{
 				base.OnMouseDown(e);
-				mouseDownPos = e.Location;
-				sideBar.activeTab.ChoosedItem = sideBar.activeTab.SelectedItem;
+				if (e.Button == MouseButtons.Left) {
+					mouseDownPos = e.Location;
+					sideBar.activeTab.ChoosedItem = sideBar.activeTab.SelectedItem;
+				}
 				Refresh();
 			}
 			
diff --git a/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs b/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
index dc6eed9730..50dca58bd2 100644
--- a/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/StatusBar/SdStatusBar.cs
@@ -132,7 +132,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			statusProgressBar.Value = 0;
 			statusProgressBar.Maximum = totalWork;
-			jobNamePanel.Text = taskName;
+			SetTaskName();
 			jobNamePanel.Visible = true;
 			statusProgressBar.Visible = true;
 		}
@@ -187,7 +187,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void SetTaskName()
 		{
-			jobNamePanel.Text = taskName;
+			jobNamePanel.Text = StringParser.Parse(taskName);
 		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
index 70fcba4899..446f7b80c1 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
@@ -115,8 +115,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		protected void ConnectBrowseFolder(string browseButton, string target)
 		{
-			// TODO: Translation:
-			ConnectBrowseFolder(browseButton, target, "Select folder");
+			ConnectBrowseFolder(browseButton, target, "${res:Dialog.ProjectOptions.SelectFolderTitle}");
 		}
 		protected void ConnectBrowseFolder(string browseButton, string target, string description)
 		{
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
index 5556be304c..da2a856952 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
@@ -376,7 +376,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public void SaveFile(FileDescriptionTemplate newfile, string content)
 		{
 			string parsedFileName = StringParser.Parse(newfile.Name);
-			string parsedContent = StringParser.Parse(content);
+			// Parse twice so that tags used in included standard header are parsed
+			string parsedContent = StringParser.Parse(StringParser.Parse(content));
 			if (parsedFileName.StartsWith("/") || parsedFileName.StartsWith("\\"))
 				parsedFileName = parsedFileName.Substring(1);
 			if (newfile.IsDependentFile && Path.IsPathRooted(parsedFileName)) {
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
index 557176210f..250ae5807e 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
@@ -251,11 +251,6 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 			((ListView)ControlDictionary["templateListView"]).View = ((RadioButton)ControlDictionary["smallIconsRadioButton"]).Checked ? View.List : View.LargeIcon;
 		}
 		
-		public bool IsFilenameAvailable(string fileName)
-		{
-			return true;
-		}
-		
 		public string NewProjectLocation;
 		public string NewCombineLocation;
 		
@@ -271,12 +266,25 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 			string solution = ((TextBox)ControlDictionary["solutionNameTextBox"]).Text;
 			string name     = ((TextBox)ControlDictionary["nameTextBox"]).Text;
 			string location = ((TextBox)ControlDictionary["locationTextBox"]).Text;
-			if (!FileUtility.IsValidFileName(solution) || solution.IndexOf(Path.DirectorySeparatorChar) >= 0 ||
-			    !FileUtility.IsValidFileName(name)     || name.IndexOf(Path.DirectorySeparatorChar) >= 0 ||
-			    !FileUtility.IsValidFileName(location)) {
+			if (!FileUtility.IsValidFileName(solution)
+			    || solution.IndexOf(Path.DirectorySeparatorChar) >= 0
+			    || solution.IndexOf(Path.AltDirectorySeparatorChar) >= 0
+			    || !FileUtility.IsValidFileName(name)
+			    || name.IndexOf(Path.AltDirectorySeparatorChar) >= 0
+			    || name.IndexOf(Path.DirectorySeparatorChar) >= 0
+			    || !FileUtility.IsValidFileName(location))
+			{
 				MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.IllegalProjectNameError}");
 				return;
 			}
+			if (!char.IsLetter(name[0]) && name[0] != '_') {
+				MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.ProjectNameMustStartWithLetter}");
+				return;
+			}
+			if (name.EndsWith(".")) {
+				MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.ProjectNameMustNotEndWithDot}");
+				return;
+			}
 			
 			PropertyService.Set("ICSharpCode.SharpDevelop.Gui.NewProjectDialog.AutoCreateProjectSubdir", ((CheckBox)ControlDictionary["autoCreateSubDirCheckBox"]).Checked);
 			if (((ListView)ControlDictionary["templateListView"]).SelectedItems.Count == 1 && ((TextBox)ControlDictionary["locationTextBox"]).Text.Length > 0 && ((TextBox)ControlDictionary["solutionNameTextBox"]).Text.Length > 0) {
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
index d70309c36b..823582bc7d 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
@@ -125,6 +125,11 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 			this.IsDirty = dirty;
 		}
 		
+		public override void Load(string fileName)
+		{
+			// TODO: reload project file
+		}
+		
 		public override void Save(string fileName)
 		{
 			foreach (IDialogPanelDescriptor pane in descriptors) {
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/ReferenceFolderNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/ReferenceFolderNode.cs
index 224c80a1f6..b597295a60 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/ReferenceFolderNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/Nodes/ReferenceFolderNode.cs
@@ -45,7 +45,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
 			sortOrder = -1;
 			
 			this.project = project;
-			Text = "References";
+			Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.ReferencesNodeText");
 			
 			OpenedIcon = "ProjectBrowser.ReferenceFolder.Open";
 			ClosedIcon = "ProjectBrowser.ReferenceFolder.Closed";
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index ba270f8cb1..46a3cd2a0f 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -149,9 +149,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			bool wordWrap = this.WordWrap;
 			textEditorControl.WordWrap = wordWrap;
 			if (wordWrap) {
-				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedBoth;
-			} else {
 				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedVertical;
+			} else {
+				textEditorControl.ScrollBars = RichTextBoxScrollBars.ForcedBoth;
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
index 0758586319..fdc538fa64 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
@@ -146,18 +146,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			switch(GetDriveType(drive)) {
 				case DriveType.Removeable:
-					text += " (Removeable)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Removeable})";
 					break;
 				case DriveType.Fixed:
-					text += " (Fixed)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Fixed})";
 					break;
 				case DriveType.Cdrom:
-					text += " (CD)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.CD})";
 					break;
 				case DriveType.Remote:
-					text += " (Remote)";
+					text += " (${res:MainWindow.Windows.FileScout.DriveType.Remote})";
 					break;
 			}
+			text = StringParser.Parse(text);
 		}
 		
 		public override string ToString()
@@ -330,7 +331,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void deleteFiles(object sender, EventArgs e)
 		{
-			if (MessageService.AskQuestion("Are you sure ?", "Delete files")) {
+			string fileName = "";
+			foreach(FileListItem fileItem in SelectedItems) {
+				fileName = fileItem.FullName;
+				break;
+			}
+			if (MessageService.AskQuestion(StringParser.Parse("${res:ProjectComponent.ContextMenu.Delete.Question}", new string[,] {{"FileName", fileName}}),
+			                               "${Global.Delete}")) {
 				foreach(FileListItem fileItem in SelectedItems)
 				{
 					try {
@@ -521,7 +528,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			rootNode.SelectedImageIndex = 6;
 			rootNode.Tag = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
 			
-			TreeNode myFilesNode = rootNode.Nodes.Add(Path.GetFileName(Environment.GetFolderPath(Environment.SpecialFolder.Personal)));
+			TreeNode myFilesNode = rootNode.Nodes.Add(ResourceService.GetString("MainWindow.Windows.FileScout.MyDocuments"));
 			myFilesNode.ImageIndex = 7;
 			myFilesNode.SelectedImageIndex = 7;
 			try {
@@ -532,7 +539,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			myFilesNode.Nodes.Add("");
 			
-			TreeNode computerNode = rootNode.Nodes.Add(StringParser.Parse("${res:MainWindow.Windows.FileScout.MyComputer}"));
+			TreeNode computerNode = rootNode.Nodes.Add(ResourceService.GetString("MainWindow.Windows.FileScout.MyComputer"));
 			computerNode.ImageIndex = 8;
 			computerNode.SelectedImageIndex = 8;
 			try {
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs
index b716d42e96..003b99515a 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs
@@ -50,7 +50,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 	
 	public class ExcludeFileFromProject : AbstractMenuCommand
 	{
-		void ExcludeFileNode(FileNode fileNode)
+		public static void ExcludeFileNode(FileNode fileNode)
 		{
 			List<FileNode> dependentNodes = new List<FileNode>();
 			foreach (TreeNode subNode in fileNode.Nodes) {
@@ -60,15 +60,22 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 			}
 			dependentNodes.ForEach(ExcludeFileNode);
 			
-			ProjectService.RemoveProjectItem(fileNode.Project, fileNode.ProjectItem);
-			fileNode.ProjectItem = null;
-			fileNode.FileNodeStatus = FileNodeStatus.None;
-			if (fileNode.Parent is ExtTreeNode) {
-				((ExtTreeNode)fileNode.Parent).UpdateVisibility();
+			bool isLink = fileNode.IsLink;
+			if (fileNode.ProjectItem != null) { // don't try to exclude same node twice
+				ProjectService.RemoveProjectItem(fileNode.Project, fileNode.ProjectItem);
+			}
+			if (isLink) {
+				fileNode.Remove();
+			} else {
+				fileNode.ProjectItem = null;
+				fileNode.FileNodeStatus = FileNodeStatus.None;
+				if (fileNode.Parent is ExtTreeNode) {
+					((ExtTreeNode)fileNode.Parent).UpdateVisibility();
+				}
 			}
 		}
 		
-		void ExcludeDirectoryNode(DirectoryNode directoryNode)
+		static void ExcludeDirectoryNode(DirectoryNode directoryNode)
 		{
 			if (directoryNode.ProjectItem != null) {
 				ProjectService.RemoveProjectItem(directoryNode.Project, directoryNode.ProjectItem);
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
index 3d406d63c4..d7cf6e26b3 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs
@@ -24,13 +24,32 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 {
 	public class AddExistingItemsToProject : AbstractMenuCommand
 	{
-		enum ReplaceExistingFile {
+		public enum ReplaceExistingFile {
 			Yes = 0,
 			YesToAll = 1,
 			No = 2,
 			Cancel = 3
 		}
 		
+		public static ReplaceExistingFile ShowReplaceExistingFileDialog(string caption, string fileName, bool replacingMultiple)
+		{
+			if (caption == null)
+				caption = "${res:ProjectComponent.ContextMenu.AddExistingFiles.ReplaceExistingFile.Title}";
+			string text = StringParser.Parse("${res:ProjectComponent.ContextMenu.AddExistingFiles.ReplaceExistingFile}", new string[,] {{"FileName", fileName}});
+			if (replacingMultiple) {
+				return (ReplaceExistingFile)
+					MessageService.ShowCustomDialog(caption, text,
+					                                0, 3,
+					                                "${res:Global.Yes}",
+					                                "${res:Global.YesToAll}",
+					                                "${res:Global.No}",
+					                                "${res:Global.CancelButtonText}");
+			} else {
+				return MessageService.AskQuestion(text, caption)
+					? ReplaceExistingFile.Yes : ReplaceExistingFile.No;
+			}
+		}
+		
 		int GetFileFilterIndex(IProject project, string[] fileFilters)
 		{
 			if (project != null) {
@@ -111,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 			string copiedFileName = Path.Combine(node.Directory, Path.GetFileName(fileName));
 			if (!FileUtility.IsEqualFileName(fileName, copiedFileName)) {
 				File.Copy(fileName, copiedFileName, true);
-			} 
+			}
 			if (includeInProject) {
 				FileNode fileNode;
 				foreach (TreeNode childNode in node.AllNodes) {
@@ -222,12 +241,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 					foreach (KeyValuePair<string, string> pair in fileNames) {
 						copiedFileName = Path.Combine(node.Directory, Path.GetFileName(pair.Key));
 						if (!replaceAll && File.Exists(copiedFileName) && !FileUtility.IsEqualFileName(pair.Key, copiedFileName)) {
-							ReplaceExistingFile res = (ReplaceExistingFile)MessageService.ShowCustomDialog(fdiag.Title, "A file with the name '" + Path.GetFileName(pair.Key) + "' already exists. Do you want to replace it?",
-						    	0, 3,
-						    	"${res:Global.Yes}",
-								"Yes to All",
-								"${res:Global.No}",
-								"${res:Global.CancelButtonText}");
+							ReplaceExistingFile res = ShowReplaceExistingFileDialog(fdiag.Title, Path.GetFileName(pair.Key), true);
 							if (res == ReplaceExistingFile.YesToAll) {
 								replaceAll = true;
 							} else if (res == ReplaceExistingFile.No) {
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
index 96f3492546..48ac08f664 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			if (project is MissingProject) {
 				CustomNode missingNode = new CustomNode();
 				missingNode.SetIcon("Icons.16x16.Warning");
-				missingNode.Text = "The project file cannot be found.";
+				missingNode.Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.ProjectFileNotFound");
 				missingNode.AddTo(projectNode);
 			} else if (project is UnknownProject) {
 				string ext = Path.GetExtension(project.FileName);
@@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				} else {
 					CustomNode unknownNode = new CustomNode();
 					unknownNode.SetIcon("Icons.16x16.Warning");
-					unknownNode.Text = "No backend for project type installed.";
+					unknownNode.Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.NoBackendForProjectType");
 					unknownNode.AddTo(projectNode);
 				}
 			} else {
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
index 27ea31e2af..c37e2630cd 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPanel.cs
@@ -105,6 +105,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		// -> nodes whose text contains '[' can not be saved
 		public static string GetViewStateString(TreeView treeView)
 		{
+			if (treeView.Nodes.Count == 0) return "";
 			StringBuilder b = new StringBuilder();
 			WriteViewStateString(b, treeView.Nodes[0]);
 			return b.ToString();
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
index bbdf7e5080..6af5b606a2 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
@@ -594,18 +594,21 @@ namespace ICSharpCode.SharpDevelop.Project
 			ProjectService.SaveSolution();
 		}
 		
-		public void CopyDirectoryHere(string fileName, bool performMove)
+		public void CopyDirectoryHere(string directoryName, bool performMove)
 		{
-			AddExistingItemsToProject.CopyDirectory(fileName, this, true);
+			string copiedName = Path.Combine(Directory, Path.GetFileName(directoryName));
+			if (FileUtility.IsEqualFileName(directoryName, copiedName))
+				return;
+			AddExistingItemsToProject.CopyDirectory(directoryName, this, true);
 			if (performMove) {
 				foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
 					if (content.FileName != null &&
-					    FileUtility.IsBaseDirectory(fileName, content.FileName))
+					    FileUtility.IsBaseDirectory(directoryName, content.FileName))
 					{
-						content.FileName = FileUtility.RenameBaseDirectory(content.FileName, fileName, Path.Combine(this.directory, Path.GetFileName(fileName)));
+						content.FileName = FileUtility.RenameBaseDirectory(content.FileName, directoryName, Path.Combine(this.directory, Path.GetFileName(directoryName)));
 					}
 				}
-				FileService.RemoveFile(fileName, true);
+				FileService.RemoveFile(directoryName, true);
 			}
 		}
 		
@@ -620,6 +623,17 @@ namespace ICSharpCode.SharpDevelop.Project
 			string copiedFileName = Path.Combine(Directory, shortFileName);
 			if (FileUtility.IsEqualFileName(fileName, copiedFileName))
 				return;
+			bool wasFileReplacement = false;
+			if (File.Exists(copiedFileName)) {
+				if (!FileService.FireFileReplacing(copiedFileName, false))
+					return;
+				if (AddExistingItemsToProject.ShowReplaceExistingFileDialog(null, copiedFileName, false) == AddExistingItemsToProject.ReplaceExistingFile.Yes) {
+					wasFileReplacement = true;
+				} else {
+					// don't replace file
+					return;
+				}
+			}
 			
 			FileProjectItem newItem = AddExistingItemsToProject.CopyFile(fileName, this, true);
 			IProject sourceProject = Solution.FindProjectContainingFile(fileName);
@@ -656,6 +670,9 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 				FileService.RemoveFile(fileName, false);
 			}
+			if (wasFileReplacement) {
+				FileService.FireFileReplaced(copiedFileName, false);
+			}
 		}
 		
 		public void CopyFileHere(FileNode node, bool performMove)
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
index a05641e275..66277dcb10 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
@@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		string         fileName       = String.Empty;
 		FileNodeStatus fileNodeStatus = FileNodeStatus.None;
 		ProjectItem    projectItem    = null;
-	
+		
 		public override bool Visible {
 			get {
 				return ShowAll || fileNodeStatus != FileNodeStatus.None;
@@ -199,20 +199,22 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public override void Delete()
 		{
-			if (FileNodeStatus == FileNodeStatus.Missing) {
-				FileService.RemoveFile(FileName, false);
-				Project.Save();
-			} else {
-				if (Nodes.Count > 0) {
-					if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.DeleteWithDependentFiles.Question}"))) {
-						DeleteChildNodes();
-						FileService.RemoveFile(FileName, false);
-						Project.Save();
-					}
-				} else if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.Delete.Question}"))) {
+			if (Nodes.Count > 0) {
+				if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.DeleteWithDependentFiles.Question}"))) {
+					DeleteChildNodes();
 					FileService.RemoveFile(FileName, false);
 					Project.Save();
 				}
+			} else if (!File.Exists(FileName)) {
+				FileService.RemoveFile(FileName, false);
+				Project.Save();
+			} else if (MessageService.AskQuestion(GetQuestionText("${res:ProjectComponent.ContextMenu.Delete.Question}"))) {
+				FileService.RemoveFile(FileName, false);
+				if (IsLink) {
+					// we need to manually remove the link
+					Commands.ExcludeFileFromProject.ExcludeFileNode(this);
+				}
+				Project.Save();
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceFolder.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceFolder.cs
index 29ef0fc554..f171f613ba 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceFolder.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceFolder.cs
@@ -23,7 +23,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			this.project = project;
 
 			ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ReferenceFolderNode";
-			Text = "References";
+			Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.ReferencesNodeText");
 			OpenedImage = "ProjectBrowser.ReferenceFolder.Open";
 			ClosedImage = "ProjectBrowser.ReferenceFolder.Closed";
 			
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs
index 77dba69a03..5f9687da3d 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs
@@ -172,6 +172,11 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public static void DoPaste(ISolutionFolderNode folderNode)
 		{
+			if (!DoEnablePaste(folderNode)) {
+				LoggingService.Warn("SolutionFolderNode.DoPaste: Pasting was not enabled.");
+				return;
+			}
+			
 			ExtTreeNode folderTreeNode = (ExtTreeNode)folderNode;
 			IDataObject dataObject = ClipboardWrapper.GetDataObject();
 			
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
index 783a2483bc..c240b21ec1 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionNode.cs
@@ -37,7 +37,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		{
 			sortOrder = -1;
 			this.solution = solution;
-			Text = "Solution " + solution.Name;
+			UpdateText();;
 			autoClearNodes = false;
 			canLabelEdit = true;
 			
@@ -61,20 +61,25 @@ namespace ICSharpCode.SharpDevelop.Project
 					return;
 				string newFileName = Path.Combine(solution.Directory, newName + ".sln");
 				if (File.Exists(newFileName)) {
-					MessageService.ShowError("The file " + newFileName + " already exists.");
+					MessageService.ShowErrorFormatted("${res:Global.FileAlreadyExists}", newFileName);
 					return;
 				}
 				FileService.RenameFile(solution.FileName, newFileName, false);
 				solution.FileName = newFileName;
 				solution.Name = newName;
 			} finally {
-				Text = "Solution " + solution.Name;
+				UpdateText();
 			}
 		}
 		
+		void UpdateText()
+		{
+			Text = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.SolutionNodeText") + " " + solution.Name;
+		}
+		
 		public void AddItem(string fileName)
 		{
-			const string folderName = "Solution Items";
+			string folderName = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.ProjectBrowser.SolutionItemsNodeText");
 			SolutionFolderNode node = null;
 			foreach (TreeNode n in Nodes) {
 				node = n as SolutionFolderNode;
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs b/src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs
index 70892243d8..a229addc90 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs
@@ -229,7 +229,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			ProjectService.CurrentProjectChanged += new ProjectEventHandler(SetProjectTitle);
 
-			FileService.FileRemoved += CheckRemovedFile;
+			FileService.FileRemoved += CheckRemovedOrReplacedFile;
+			FileService.FileReplaced += CheckRemovedOrReplacedFile;
 			FileService.FileRenamed += CheckRenamedFile;
 			
 			FileService.FileRemoved += FileService.RecentOpen.FileRemoved;
@@ -448,7 +449,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		void CheckRemovedFile(object sender, FileEventArgs e)
+		void CheckRemovedOrReplacedFile(object sender, FileEventArgs e)
 		{
 			for (int i = 0; i < ViewContentCollection.Count;) {
 				if (FileUtility.IsBaseDirectory(e.FileName, ViewContentCollection[i].FileName)) {
@@ -463,8 +464,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			if (e.IsDirectory) {
 				foreach (IViewContent content in ViewContentCollection) {
-					if (content.FileName != null && content.FileName.StartsWith(e.SourceFile)) {
-						content.FileName = e.TargetFile + content.FileName.Substring(e.SourceFile.Length);
+					if (content.FileName != null && FileUtility.IsBaseDirectory(e.SourceFile, content.FileName)) {
+						content.FileName = FileUtility.RenameBaseDirectory(content.FileName, e.SourceFile, e.TargetFile);
 					}
 				}
 			} else {
diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs
index 2352015867..8fb2552c09 100644
--- a/src/Main/Base/Project/Src/Project/AbstractProject.cs
+++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs
@@ -317,6 +317,21 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
+		[Browsable(false)]
+		public string IntermediateOutputFullPath {
+			get {
+				string outputPath = GetProperty("IntermediateOutputPath");
+				if (string.IsNullOrEmpty(outputPath)) {
+					outputPath = GetProperty("BaseIntermediateOutputPath");
+					if (string.IsNullOrEmpty(outputPath)) {
+						outputPath = "obj";
+					}
+					outputPath = Path.Combine(outputPath, activeConfiguration);
+				}
+				return Path.Combine(Directory, outputPath);
+			}
+		}
+		
 		public static string GetExtension(OutputType outputType)
 		{
 			switch (outputType) {
diff --git a/src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs b/src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs
index b101aa2ec6..25d4438d09 100644
--- a/src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs
+++ b/src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs
@@ -346,8 +346,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				int val;
 				if (!int.TryParse(txt, style, NumberFormatInfo.InvariantInfo, out val)) {
 					textBox.Focus();
-					// TODO: Translate Please enter a valid number.
-					MessageService.ShowMessage("Please enter a valid number.");
+					MessageService.ShowMessage("${res:Dialog.ProjectOptions.PleaseEnterValidNumber}");
 					return false;
 				}
 				Set(val.ToString(NumberFormatInfo.InvariantInfo));
diff --git a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs
index 6ebe75112c..4bafdaccfb 100644
--- a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs
+++ b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs
@@ -117,17 +117,21 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 		public override void Run()
 		{
 			conversionLog = new StringBuilder();
-			conversionLog.AppendLine("SharpDevelop Project Converter");
-			conversionLog.AppendLine("==============================");
-			conversionLog.AppendLine("");
+			string translatedTitle = ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.ProjectConverter");
+			conversionLog.AppendLine(translatedTitle);
+			conversionLog.Append('=', translatedTitle.Length);
+			conversionLog.AppendLine();
+			conversionLog.AppendLine();
 			IProject sourceProject = ProjectService.CurrentProject;
 			string targetProjectDirectory = sourceProject.Directory + ".ConvertedTo" + TargetLanguageName;
 			if (Directory.Exists(targetProjectDirectory)) {
-				MessageService.ShowMessage(targetProjectDirectory + " already exists, cannot convert.");
+				MessageService.ShowMessageFormatted("${res:ICSharpCode.SharpDevelop.Commands.Convert.TargetAlreadyExists}", targetProjectDirectory);
 				return;
 			}
-			conversionLog.AppendLine("Source: " + sourceProject.Directory);
-			conversionLog.AppendLine("Target: " + targetProjectDirectory);
+			conversionLog.Append(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.SourceDirectory")).Append(": ");
+			conversionLog.AppendLine(sourceProject.Directory);
+			conversionLog.Append(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.TargetDirectory")).Append(": ");
+			conversionLog.AppendLine(targetProjectDirectory);
 			
 			Directory.CreateDirectory(targetProjectDirectory);
 			IProject targetProject = CreateProject(targetProjectDirectory, sourceProject);
@@ -136,7 +140,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 			CopyItems(sourceProject, targetProject);
 			conversionLog.AppendLine();
 			AfterConversion(targetProject);
-			conversionLog.AppendLine("Conversion complete.");
+			conversionLog.AppendLine(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.ConversionComplete"));
 			targetProject.Save();
 			targetProject.Dispose();
 			TreeNode node = ProjectBrowserPad.Instance.SelectedNode;
@@ -152,7 +156,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 				node = node.Parent;
 			}
 			ICSharpCode.SharpDevelop.Gui.IWorkbenchWindow newFileWindow;
-			newFileWindow = FileService.NewFile("Conversion Results", "Text", conversionLog.ToString());
+			newFileWindow = FileService.NewFile(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.ConversionResults"), "Text", conversionLog.ToString());
 			if (newFileWindow != null) {
 				newFileWindow.ViewContent.IsDirty = false;
 			}
@@ -174,8 +178,10 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 				p.Parse();
 				if (p.Errors.count > 0) {
 					conversionLog.AppendLine();
-					conversionLog.AppendLine(sourceItem.FileName + " is not converted:");
-					conversionLog.AppendLine("Parser found " + p.Errors.count + " error(s)");
+					conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.IsNotConverted}",
+					                                            new string[,] {{"FileName", sourceItem.FileName}}));
+					conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.ParserErrorCount}",
+					                                            new string[,] {{"ErrorCount", p.Errors.count.ToString()}}));
 					conversionLog.AppendLine(p.Errors.ErrorOutput);
 					base.ConvertFile(sourceItem, targetItem);
 					return;
@@ -193,7 +199,11 @@ namespace ICSharpCode.SharpDevelop.Project.Converter
 				
 				if (outputVisitor.Errors.count > 0) {
 					conversionLog.AppendLine();
-					conversionLog.AppendLine(outputVisitor.Errors.count + " error(s) converting " + sourceItem.FileName + ":");
+					conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.ConverterErrorCount}",
+					                                            new string[,] {
+					                                            	{"FileName", sourceItem.FileName},
+					                                            	{"ErrorCount", outputVisitor.Errors.count.ToString()}
+					                                            }));
 					conversionLog.AppendLine(outputVisitor.Errors.ErrorOutput);
 				}
 				
diff --git a/src/Main/Base/Project/Src/Project/IProject.cs b/src/Main/Base/Project/Src/Project/IProject.cs
index 24dc739bd4..eb27f00b8e 100644
--- a/src/Main/Base/Project/Src/Project/IProject.cs
+++ b/src/Main/Base/Project/Src/Project/IProject.cs
@@ -86,6 +86,10 @@ namespace ICSharpCode.SharpDevelop.Project
 			get;
 		}
 		
+		string IntermediateOutputFullPath {
+			get;
+		}
+		
 		OutputType OutputType {
 			get;
 			set;
diff --git a/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs
index 8e88ec490a..dd870910c3 100644
--- a/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs
@@ -115,6 +115,18 @@ namespace ICSharpCode.SharpDevelop.Project
 						if (File.Exists(interopFileName)) {
 							return interopFileName;
 						}
+						
+						// look in obj\Debug:
+						outputFolder = Project.IntermediateOutputFullPath;
+						interopFileName = Path.Combine(outputFolder, String.Concat("Interop.", Include, ".dll"));
+						if (File.Exists(interopFileName)) {
+							return interopFileName;
+						}
+						// Look for ActiveX interop.
+						interopFileName = GetActiveXInteropFileName(outputFolder, Include);
+						if (File.Exists(interopFileName)) {
+							return interopFileName;
+						}
 					}
 				}
 				catch (Exception) { }
diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
index 0300dc46cc..f7169d6488 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildEngine.cs
@@ -221,6 +221,9 @@ namespace ICSharpCode.SharpDevelop.Project
 						results.NativeCompilerReturnValue = 0;
 					else
 						results.NativeCompilerReturnValue = 1;
+				} catch (ArgumentException ex) {
+					results.NativeCompilerReturnValue = -2;
+					results.Errors.Add(new CompilerError(null, -1, -1, "", ex.Message));
 				} catch (InvalidProjectFileException ex) {
 					results.NativeCompilerReturnValue = -2;
 					results.Errors.Add(new CompilerError(ex.ProjectFile, ex.LineNumber, ex.ColumnNumber, ex.ErrorCode, ex.Message));
diff --git a/src/Main/Base/Project/Src/Services/File/FileService.cs b/src/Main/Base/Project/Src/Services/File/FileService.cs
index 2cd1c9e5cb..d18e3a3902 100644
--- a/src/Main/Base/Project/Src/Services/File/FileService.cs
+++ b/src/Main/Base/Project/Src/Services/File/FileService.cs
@@ -258,10 +258,29 @@ namespace ICSharpCode.Core
 			}
 		}
 		
+		public static bool FireFileReplacing(string fileName, bool isDirectory)
+		{
+			FileCancelEventArgs e = new FileCancelEventArgs(fileName, isDirectory);
+			if (FileReplacing != null) {
+				FileReplacing(null, e);
+			}
+			return !e.Cancel;
+		}
+		
+		public static void FireFileReplaced(string fileName, bool isDirectory)
+		{
+			if (FileReplaced != null) {
+				FileReplaced(null, new FileEventArgs(fileName, isDirectory));
+			}
+		}
+		
 		public static event EventHandler<FileRenamingEventArgs> FileRenaming;
 		public static event EventHandler<FileRenameEventArgs> FileRenamed;
 		
 		public static event EventHandler<FileCancelEventArgs> FileRemoving;
 		public static event EventHandler<FileEventArgs> FileRemoved;
+		
+		public static event EventHandler<FileCancelEventArgs> FileReplacing;
+		public static event EventHandler<FileEventArgs> FileReplaced;
 	}
 }
diff --git a/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs b/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs
index ea56deef2a..c3bbaf6c44 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs
@@ -194,10 +194,12 @@ namespace ICSharpCode.Core
 			if (desc != null) {
 				return desc;
 			}
-			foreach (IProjectContent referencedContent in referencedContents) {
-				desc = referencedContent.XmlDoc.GetDocumentation(memberTag);
-				if (desc != null) {
-					return desc;
+			lock (referencedContents) {
+				foreach (IProjectContent referencedContent in referencedContents) {
+					desc = referencedContent.XmlDoc.GetDocumentation(memberTag);
+					if (desc != null) {
+						return desc;
+					}
 				}
 			}
 			return null;
@@ -547,13 +549,15 @@ namespace ICSharpCode.Core
 			
 			// Search in references:
 			if (lookInReferences) {
-				foreach (IProjectContent content in referencedContents) {
-					IClass contentClass = content.GetClass(typeName, typeParameterCount, language, false);
-					if (contentClass != null) {
-						if (contentClass.TypeParameters.Count == typeParameterCount) {
-							return contentClass;
-						} else {
-							c = contentClass;
+				lock (referencedContents) {
+					foreach (IProjectContent content in referencedContents) {
+						IClass contentClass = content.GetClass(typeName, typeParameterCount, language, false);
+						if (contentClass != null) {
+							if (contentClass.TypeParameters.Count == typeParameterCount) {
+								return contentClass;
+							} else {
+								c = contentClass;
+							}
 						}
 					}
 				}
@@ -602,8 +606,10 @@ namespace ICSharpCode.Core
 			}
 			
 			if (lookInReferences) {
-				foreach (IProjectContent content in referencedContents) {
-					content.AddNamespaceContents(list, nameSpace, language, false);
+				lock (referencedContents) {
+					foreach (IProjectContent content in referencedContents) {
+						content.AddNamespaceContents(list, nameSpace, language, false);
+					}
 				}
 			}
 			
@@ -669,9 +675,11 @@ namespace ICSharpCode.Core
 			}
 			
 			if (lookInReferences) {
-				foreach (IProjectContent content in referencedContents) {
-					if (content.NamespaceExists(name, language, false)) {
-						return true;
+				lock (referencedContents) {
+					foreach (IProjectContent content in referencedContents) {
+						if (content.NamespaceExists(name, language, false)) {
+							return true;
+						}
 					}
 				}
 			}
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs b/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
index 828a1c59a4..85076c1717 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ParseProjectContent.cs
@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 using ICSharpCode.Core;
@@ -55,7 +56,6 @@ namespace ICSharpCode.Core
 			ProjectItem[] items = project.Items.ToArray();
 			ProjectService.ProjectItemAdded   += OnProjectItemAdded;
 			ProjectService.ProjectItemRemoved += OnProjectItemRemoved;
-			ProjectService.EndBuild += OnEndBuild;
 			UpdateDefaultImports(items);
 			foreach (ProjectItem item in items) {
 				if (!initializing) return; // abort initialization
@@ -74,7 +74,11 @@ namespace ICSharpCode.Core
 		void UpdateReferenceInterDependencies()
 		{
 			// Use ToArray because the collection could be modified inside the loop
-			foreach (IProjectContent referencedContent in this.referencedContents.ToArray()) {
+			IProjectContent[] referencedContents;
+			lock (this.referencedContents) {
+				referencedContents = this.referencedContents.ToArray();
+			}
+			foreach (IProjectContent referencedContent in referencedContents) {
 				if (referencedContent is ReflectionProjectContent) {
 					((ReflectionProjectContent)referencedContent).InitializeReferences();
 				}
@@ -86,7 +90,9 @@ namespace ICSharpCode.Core
 			try {
 				IProjectContent referencedContent = ProjectContentRegistry.GetProjectContentForReference(reference);
 				if (referencedContent != null) {
-					ReferencedContents.Add(referencedContent);
+					lock (this.referencedContents) {
+						this.referencedContents.Add(referencedContent);
+					}
 				}
 				if (updateInterDependencies) {
 					UpdateReferenceInterDependencies();
@@ -103,13 +109,48 @@ namespace ICSharpCode.Core
 			AddReference((ReferenceProjectItem)state, true);
 		}
 		
+		// ensure that com references are built serially because we cannot invoke multiple instances of MSBuild
+		static Queue<System.Windows.Forms.MethodInvoker> callAfterAddComReference = new Queue<System.Windows.Forms.MethodInvoker>();
+		static bool buildingComReference;
+		
 		void OnProjectItemAdded(object sender, ProjectItemEventArgs e)
 		{
 			if (e.Project != project) return;
 			
 			ReferenceProjectItem reference = e.ProjectItem as ReferenceProjectItem;
 			if (reference != null) {
-				System.Threading.ThreadPool.QueueUserWorkItem(AddReference, reference);
+				if (reference.ItemType == ItemType.COMReference) {
+					System.Windows.Forms.MethodInvoker action = delegate {
+						// Compile project to ensure interop library is generated
+						project.Save(); // project is not yet saved when ItemAdded fires, so save it here
+						TaskService.BuildMessageViewCategory.AppendText("\n${res:MainWindow.CompilerMessages.CreatingCOMInteropAssembly}\n");
+						MSBuildEngineCallback callback = delegate {
+							System.Threading.ThreadPool.QueueUserWorkItem(AddReference, reference);
+							lock (callAfterAddComReference) {
+								if (callAfterAddComReference.Count > 0) {
+									callAfterAddComReference.Dequeue()();
+								} else {
+									buildingComReference = false;
+								}
+							}
+						};
+						if (project is MSBuildProject) {
+							((MSBuildProject)project).RunMSBuild("ResolveComReferences", callback);
+						} else {
+							project.Build(callback);
+						}
+					};
+					lock (callAfterAddComReference) {
+						if (buildingComReference) {
+							callAfterAddComReference.Enqueue(action);
+						} else {
+							buildingComReference = true;
+							action();
+						}
+					}
+				} else {
+					System.Threading.ThreadPool.QueueUserWorkItem(AddReference, reference);
+				}
 			}
 			switch (e.ProjectItem.ItemType) {
 				case ItemType.Import:
@@ -130,7 +171,9 @@ namespace ICSharpCode.Core
 				try {
 					IProjectContent referencedContent = ProjectContentRegistry.GetExistingProjectContentForReference(reference);
 					if (referencedContent != null) {
-						ReferencedContents.Remove(referencedContent);
+						lock (ReferencedContents) {
+							ReferencedContents.Remove(referencedContent);
+						}
 						OnReferencedContentsChanged(EventArgs.Empty);
 					}
 				} catch (Exception ex) {
@@ -190,9 +233,14 @@ namespace ICSharpCode.Core
 			int progressStart = StatusBarService.ProgressMonitor.WorkDone;
 			ParseableFileContentEnumerator enumerator = new ParseableFileContentEnumerator(project);
 			try {
-				StatusBarService.ProgressMonitor.TaskName = "Parsing " + project.Name + "...";
+				StatusBarService.ProgressMonitor.TaskName = "${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing} " + project.Name + "...";
+				
+				IProjectContent[] referencedContents;
+				lock (this.referencedContents) {
+					referencedContents = this.referencedContents.ToArray();
+				}
 				
-				foreach (IProjectContent referencedContent in ReferencedContents) {
+				foreach (IProjectContent referencedContent in referencedContents) {
 					if (referencedContent is ReflectionProjectContent) {
 						((ReflectionProjectContent)referencedContent).InitializeReferences();
 					}
@@ -218,25 +266,8 @@ namespace ICSharpCode.Core
 		{
 			ProjectService.ProjectItemAdded   -= OnProjectItemAdded;
 			ProjectService.ProjectItemRemoved -= OnProjectItemRemoved;
-			ProjectService.EndBuild -= OnEndBuild;
 			initializing = false;
 			base.Dispose();
 		}
-				
-		void OnEndBuild(object source, EventArgs e)
-		{
-			AddComReferences();	
-		}
-		
-		void AddComReferences()
-		{
-			if (project != null) {
-				foreach (ProjectItem item in project.Items) {
-					if (item.ItemType == ItemType.COMReference) {
-						System.Threading.ThreadPool.QueueUserWorkItem(AddReference, item as ReferenceProjectItem);
-					}
-				}
-			}
-		}
 	}
 }
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs b/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
index 2eaeb8fbe4..887cadcc87 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
@@ -64,7 +64,7 @@ namespace ICSharpCode.Core
 				foreach (IProjectContent pc in AllProjectContents) {
 					yield return pc;
 				}
-				foreach (IProjectContent pc in ProjectContentRegistry.LoadedProjectContents) {
+				foreach (IProjectContent pc in ProjectContentRegistry.GetLoadedProjectContents()) {
 					yield return pc;
 				}
 			}
@@ -142,7 +142,7 @@ namespace ICSharpCode.Core
 					}
 					createdContents.Add(newContent);
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while retrieving project contents from " + project);
+					MessageService.ShowError(e, "Error while retrieving project contents from " + project);
 				}
 			}
 			WorkbenchSingleton.SafeThreadAsyncCall((ThreadStart)ProjectService.ParserServiceCreatedProjectContents);
@@ -153,16 +153,16 @@ namespace ICSharpCode.Core
 					newContent.Initialize1();
 					workAmount += newContent.GetInitializationWorkAmount();
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while initializing project references:" + newContent);
+					MessageService.ShowError(e, "Error while initializing project references:" + newContent);
 				}
 			}
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", workAmount);
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", workAmount);
 			foreach (ParseProjectContent newContent in createdContents) {
 				if (abortLoadSolutionProjectsThread) break;
 				try {
 					newContent.Initialize2();
 				} catch (Exception e) {
-					ICSharpCode.Core.MessageService.ShowError(e, "Error while initializing project contents:" + newContent);
+					MessageService.ShowError(e, "Error while initializing project contents:" + newContent);
 				}
 			}
 			StatusBarService.ProgressMonitor.Done();
@@ -172,7 +172,7 @@ namespace ICSharpCode.Core
 		{
 			ParseProjectContent newContent = (ParseProjectContent)state;
 			newContent.Initialize1();
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", newContent.GetInitializationWorkAmount());
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", newContent.GetInitializationWorkAmount());
 			newContent.Initialize2();
 			StatusBarService.ProgressMonitor.Done();
 		}
@@ -180,7 +180,7 @@ namespace ICSharpCode.Core
 		static void ReparseProject(object state)
 		{
 			ParseProjectContent newContent = (ParseProjectContent)state;
-			StatusBarService.ProgressMonitor.BeginTask("Parsing...", newContent.GetInitializationWorkAmount());
+			StatusBarService.ProgressMonitor.BeginTask("${res:ICSharpCode.SharpDevelop.Internal.ParserService.Parsing}...", newContent.GetInitializationWorkAmount());
 			newContent.ReInitialize2();
 			StatusBarService.ProgressMonitor.Done();
 		}
@@ -595,6 +595,8 @@ namespace ICSharpCode.Core
 		
 		public static IParser GetParser(string fileName)
 		{
+			if (fileName == null)
+				throw new ArgumentNullException("fileName");
 			IParser curParser = null;
 			foreach (ParserDescriptor descriptor in parser) {
 				if (descriptor.CanParse(fileName)) {
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs b/src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
index b18cfac6d8..4b225db4d9 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
@@ -63,9 +63,10 @@ namespace ICSharpCode.Core
 			}
 		}
 		
-		public static IEnumerable<IProjectContent> LoadedProjectContents {
-			get {
-				return contents.Values;
+		public static ICollection<IProjectContent> GetLoadedProjectContents()
+		{
+			lock (contents) { // we need to return a copy because we have to lock
+				return new List<IProjectContent>(contents.Values);
 			}
 		}
 		
diff --git a/src/Main/Base/Project/Src/Services/ParserService/ReflectionProjectContent.cs b/src/Main/Base/Project/Src/Services/ParserService/ReflectionProjectContent.cs
index 7e241eeabe..c18bbccf72 100644
--- a/src/Main/Base/Project/Src/Services/ParserService/ReflectionProjectContent.cs
+++ b/src/Main/Base/Project/Src/Services/ParserService/ReflectionProjectContent.cs
@@ -119,7 +119,9 @@ namespace ICSharpCode.SharpDevelop.Dom
 						IProjectContent content = ProjectContentRegistry.GetExistingProjectContent((AssemblyName)missingNames[i]);
 						if (content != null) {
 							changed = true;
-							ReferencedContents.Add(content);
+							lock (ReferencedContents) {
+								ReferencedContents.Add(content);
+							}
 							missingNames.RemoveAt(i--);
 						}
 					}
@@ -136,7 +138,9 @@ namespace ICSharpCode.SharpDevelop.Dom
 				IProjectContent content = ProjectContentRegistry.GetExistingProjectContent(name);
 				if (content != null) {
 					changed = true;
-					ReferencedContents.Add(content);
+					lock (ReferencedContents) {
+						ReferencedContents.Add(content);
+					}
 				} else {
 					if (missingNames == null)
 						missingNames = new ArrayList();
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
index 0fdbb904c3..744b5e5993 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
@@ -143,7 +143,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		
 		public static bool IsReadOnly(IClass c)
 		{
-			return c.CompilationUnit.FileName == null;
+			return c.CompilationUnit.FileName == null || c.GetCompoundClass().IsSynthetic;
 		}
 		
 		public static TextEditorControl JumpToDefinition(IMember member)
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryCodeGenerator.cs b/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryCodeGenerator.cs
index 13dfb768c6..b8157b0785 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryCodeGenerator.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryCodeGenerator.cs
@@ -29,7 +29,10 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			if (node is Statement)
 				visitor.OutputFormatter.Indent();
 			node.AcceptVisitor(visitor, null);
-			return visitor.Text;
+			string text = visitor.Text;
+			if (node is Statement && !text.EndsWith("\n"))
+				text += Environment.NewLine;
+			return text;
 		}
 	}
 	
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryRefactoringProvider.cs b/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryRefactoringProvider.cs
index 6c453deda3..37db534027 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryRefactoringProvider.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/NRefactoryRefactoringProvider.cs
@@ -22,11 +22,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 		public override bool IsEnabledForFile(string fileName)
 		{
 			string extension = Path.GetExtension(fileName);
-			if (extension == null) {
+			if (extension.Equals(".cs", StringComparison.InvariantCultureIgnoreCase))
+				return true;
+			else if (extension.Equals(".vb", StringComparison.InvariantCultureIgnoreCase))
+				return true;
+			else
 				return false;
-			}
-			return extension.Equals(".cs", StringComparison.InvariantCultureIgnoreCase) ||
-				   extension.Equals(".vb", StringComparison.InvariantCultureIgnoreCase);
 		}
 		
 		#region FindUnusedUsingDeclarations
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs b/src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs
index da784d2715..7ffa90234e 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs
@@ -42,6 +42,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			LanguageProperties language = ParserService.CurrentProjectContent.Language;
 			if (language == null)
 				return false;
+			if (string.IsNullOrEmpty(provider.TextEditorControl.FileName))
+				return false;
 			
 			RefactoringProvider rp = language.RefactoringProvider;
 			if (!rp.IsEnabledForFile(provider.TextEditorControl.FileName))
diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs b/src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs
index 153b53de0b..d0b6dec1c1 100644
--- a/src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs
@@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 	{
 		public override void Run()
 		{
-			OptionsCommand.ShowTabbedOptions("ShowTabbedOptions",
+			OptionsCommand.ShowTabbedOptions(ResourceService.GetString("Dialog.Options.BufferOptions"),
 			                                 AddInTree.GetTreeNode("/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog"));
 		}
 	}
diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
index 9467642cfb..3f24f2edec 100644
--- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
@@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 		{
 			TextEditorDisplayBindingWrapper b2 = new TextEditorDisplayBindingWrapper();
 			
-			b2.textAreaControl.Document.TextContent = StringParser.Parse(content);
+			b2.textAreaControl.Document.TextContent = content;
 			b2.textAreaControl.Document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategy(language);
 			b2.textAreaControl.InitializeAdvancedHighlighter();
 			b2.textAreaControl.InitializeFormatter();
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
index 3dc77ed2c1..d407f46c4d 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
@@ -24,6 +24,7 @@ namespace ICSharpCode.Core
 		
 		public Menu(Codon codon, object caller, ArrayList subItems)
 		{
+			if (subItems == null) subItems = new ArrayList(); // don't crash when item has no children
 			this.codon    = codon;
 			this.caller   = caller;
 			this.subItems = subItems;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index 0a942f5942..233f5541cc 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ