From 610772fb4b78218ccfd40f4bc0465fada6d2ebad Mon Sep 17 00:00:00 2001
From: John Cronin <jncronin@tysos.org>
Date: Thu, 2 Nov 2017 17:24:12 +0000
Subject: [PATCH] Retarget to netstandard 2.0 (.net 4.6.1 for tools build on
 windows, net core 2.0 for libraries used at runtime)

---
 .gitmodules                                   |   4 -
 corefx                                        |   2 +-
 libsupcs/libsupcs.csproj                      |  11 +-
 libtysila5/libtysila5.csproj                  |   7 +-
 libtysila5/target/x86/x86_Assembler.cs        |   7 +
 metadata/PEFile.cs                            |   2 +-
 metadata/metadata.csproj                      |   4 +-
 tl/binary_library/BinaryFile.cs               |   2 +
 tl/binary_library/IBinaryFile.cs              |   3 +
 tl/binary_library/binary/hex.cs               |  23 +-
 tl/binary_library/binary_library.csproj       |  13 +-
 tl/binary_library/elf/ElfFile.cs              |   4 +
 tymake/Program.cs                             |  27 +-
 tymake/RuleFor.cs                             |  38 +-
 tymake/stdlib.tmh                             |  39 +-
 tymake/tysos.tmk                              | 173 +++++----
 tymake_lib/Expression.cs                      |  95 +++--
 tymake_lib/Statement.cs                       |  40 ++-
 tymake_lib/tml.conflicts                      |   2 +-
 tymake_lib/tml.cs                             |   2 +-
 tymake_lib/tml.y                              |   1 +
 tymake_lib/tmlp.cs                            | 294 +++++++--------
 typroject/Expression.cs                       |  22 +-
 typroject/GenerateResourcesCode.cs            |   3 +
 typroject/Program.cs                          | 337 +++++++++++++----
 typroject/typ.conflicts                       |   2 +-
 typroject/typ.cs                              | 338 ++++++++++++------
 typroject/typ.lex                             |   1 +
 typroject/typ.y                               |   3 +-
 typroject/typp.cs                             | 186 +++++-----
 typroject/typroject.csproj.user               |   2 +-
 tysila4/COutput.cs                            | 206 +++++------
 tysila4/tysila4.csproj                        |   8 -
 tysos/tysos.csproj                            |  15 +-
 .../char-conversions/char-conversions.csproj  |   9 -
 35 files changed, 1250 insertions(+), 675 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 88d7fca3..f70ce976 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,3 @@
 	path = corefx
 	url = https://github.com/dotnet/corefx.git
 	branch = release/2.0.0
-	
-[submodule "tymake/ILMerge"]
-	path = tymake/ILMerge
-	url = https://github.com/Microsoft/ILMerge.git
diff --git a/corefx b/corefx
index a7d59c16..f997049c 160000
--- a/corefx
+++ b/corefx
@@ -1 +1 @@
-Subproject commit a7d59c16e8e1f7975b26e0f9780eadcd8526cbab
+Subproject commit f997049cd490961aae8f2685ff86c867401ab1cc
diff --git a/libsupcs/libsupcs.csproj b/libsupcs/libsupcs.csproj
index 858478ac..68830fb6 100644
--- a/libsupcs/libsupcs.csproj
+++ b/libsupcs/libsupcs.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>libsupcs</RootNamespace>
     <AssemblyName>libsupcs</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -23,6 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile libsupcs|AnyCPU'">
     <OutputPath>bin\Compile libsupcs\</OutputPath>
@@ -44,6 +46,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile BareBones|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -54,6 +57,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="abi.cs" />
@@ -77,9 +81,6 @@
     <Compile Include="x86_64_invoke.cs" />
     <Compile Include="x86_64_Unwinder.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="x86_64_cpu.asm" />
     <Content Include="x86_64_Invoke.asm" />
diff --git a/libtysila5/libtysila5.csproj b/libtysila5/libtysila5.csproj
index 3a0ca364..4222bc6a 100644
--- a/libtysila5/libtysila5.csproj
+++ b/libtysila5/libtysila5.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>libtysila5</RootNamespace>
     <AssemblyName>libtysila5</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssembleMethod.cs" />
@@ -99,9 +101,6 @@
     <None Include="target\TargetInit.td" />
     <None Include="target\x86\x86.td" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/libtysila5/target/x86/x86_Assembler.cs b/libtysila5/target/x86/x86_Assembler.cs
index 363922ba..0ded5b9b 100644
--- a/libtysila5/target/x86/x86_Assembler.cs
+++ b/libtysila5/target/x86/x86_Assembler.cs
@@ -39,14 +39,18 @@ bool has_cpu_feature(string name)
         {
             // get cpu family, model, stepping
             int family = 0;
+#if HAVE_SYSTEM
             var lvls = Environment.GetEnvironmentVariable("PROCESSOR_LEVEL");
             if(lvls != null)
             {
                 int.TryParse(lvls, out family);
             }
+#endif
 
             int model = 0;
             int stepping = 0;
+
+#if HAVE_SYSTEM
             var rev = Environment.GetEnvironmentVariable("PROCESSOR_REVISION");
             if(rev != null)
             {
@@ -59,11 +63,14 @@ bool has_cpu_feature(string name)
                     int.TryParse(steps, System.Globalization.NumberStyles.HexNumber, null, out stepping);
                 }
             }
+#endif
 
             bool is_amd64 = false;
+#if HAVE_SYSTEM
             var parch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
             if (parch != null && parch == "AMD64")
                 is_amd64 = true;
+#endif
 
             if(name == "sse2")
             {
diff --git a/metadata/PEFile.cs b/metadata/PEFile.cs
index acc70632..8dd0582e 100644
--- a/metadata/PEFile.cs
+++ b/metadata/PEFile.cs
@@ -136,7 +136,7 @@ public MetadataStream Parse(DataInterface file, AssemblyLoader al)
 
                 pefh.Sections[i].Name = new String(w_str);
                 pefh.Sections[i].Name = pefh.Sections[i].Name.Remove(pefh.Sections[i].Name.IndexOf("\0"));
-                System.Diagnostics.Debugger.Log(0, "metadata", "PEFile.Parse: section name: " + pefh.Sections[i].Name + Environment.NewLine);
+                System.Diagnostics.Debugger.Log(0, "metadata", "PEFile.Parse: section name: " + pefh.Sections[i].Name + "\n");
 
                 pefh.Sections[i].VSize = file.ReadUInt((int)s_start + 8);
                 pefh.Sections[i].VAddress = file.ReadUInt((int)s_start + 12);
diff --git a/metadata/metadata.csproj b/metadata/metadata.csproj
index df48d116..60254acb 100644
--- a/metadata/metadata.csproj
+++ b/metadata/metadata.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>metadata</RootNamespace>
     <AssemblyName>metadata</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyLoader.cs" />
diff --git a/tl/binary_library/BinaryFile.cs b/tl/binary_library/BinaryFile.cs
index e101e896..e47fb329 100644
--- a/tl/binary_library/BinaryFile.cs
+++ b/tl/binary_library/BinaryFile.cs
@@ -187,6 +187,7 @@ public virtual ISection FindSection(string name)
             return null;
         }
 
+#if HAVE_SYSTEM
         public virtual ISection FindSection(System.Text.RegularExpressions.Regex r)
         {
             foreach (ISection sect in sections)
@@ -196,6 +197,7 @@ public virtual ISection FindSection(System.Text.RegularExpressions.Regex r)
             }
             return null;
         }
+#endif
 
         public virtual bool ContainsSymbol(ISymbol symbol)
         {
diff --git a/tl/binary_library/IBinaryFile.cs b/tl/binary_library/IBinaryFile.cs
index 0fbc08b8..a3395b0f 100644
--- a/tl/binary_library/IBinaryFile.cs
+++ b/tl/binary_library/IBinaryFile.cs
@@ -60,7 +60,10 @@ public interface IBinaryFile
         ISection CreateSection();
         ISection CreateContentsSection();
         ISection FindSection(string name);
+
+#if HAVE_SYSTEM
         ISection FindSection(System.Text.RegularExpressions.Regex r);
+#endif
 
         int GetSymbolCount();
         ISymbol GetSymbol(int idx);
diff --git a/tl/binary_library/binary/hex.cs b/tl/binary_library/binary/hex.cs
index 4bf73317..fd4a0169 100644
--- a/tl/binary_library/binary/hex.cs
+++ b/tl/binary_library/binary/hex.cs
@@ -59,7 +59,7 @@ protected override void Write(BinaryWriter w)
             }
             progbits.Sort((a, b) => a.LoadAddress.CompareTo(b.LoadAddress));
 
-            StreamWriter sw = new StreamWriter(w.BaseStream, Encoding.ASCII);
+            //StreamWriter sw = new StreamWriter(w.BaseStream, Encoding.ASCII);
 
             // Now rebase zero to be the load address of the first section
             uint addr = 0;
@@ -75,7 +75,7 @@ protected override void Write(BinaryWriter w)
                 // write zeros up to the current load address
                 while (base_addr < sect.LoadAddress)
                 {
-                    Write(sw, addr, 0);
+                    Write(w.BaseStream, addr, 0);
                     base_addr++;
                     addr++;
                 }
@@ -83,17 +83,26 @@ protected override void Write(BinaryWriter w)
                 // write the section data
                 foreach (byte b in sect.Data)
                 {
-                    Write(sw, addr, b);
+                    Write(w.BaseStream, addr, b);
                     base_addr++;
                     addr++;
                 }
             }
 
-            sw.WriteLine(":00000001FF");
-            sw.Flush();
+            writeStr(w.BaseStream, ":00000001FF", true);
+            w.BaseStream.Flush();
         }
 
-        private void Write(StreamWriter sw, uint addr, byte v)
+        /* Implemented here incase mscorlib does not contain StreamWriter */
+        public static void writeStr(Stream s, string v = "", bool newline = true)
+        {
+            foreach (var c in v)
+                s.WriteByte((byte)c);
+            if (newline)
+                s.WriteByte((byte)'\n');
+        }
+
+        private void Write(Stream sw, uint addr, byte v)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append(":01");
@@ -107,7 +116,7 @@ private void Write(StreamWriter sw, uint addr, byte v)
             csum &= 0xffU;
             sb.Append(csum.ToString("X2"));
 
-            sw.WriteLine(sb.ToString());
+            writeStr(sw, sb.ToString(), true);
         }
     }
 }
diff --git a/tl/binary_library/binary_library.csproj b/tl/binary_library/binary_library.csproj
index fff99e8f..33dd0aca 100644
--- a/tl/binary_library/binary_library.csproj
+++ b/tl/binary_library/binary_library.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>binary_library</RootNamespace>
     <AssemblyName>binary_library</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile BareBones|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -39,6 +42,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinaryFile.cs" />
@@ -60,9 +64,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Symbol.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/tl/binary_library/elf/ElfFile.cs b/tl/binary_library/elf/ElfFile.cs
index 952eacb9..15cfc0d9 100644
--- a/tl/binary_library/elf/ElfFile.cs
+++ b/tl/binary_library/elf/ElfFile.cs
@@ -503,15 +503,19 @@ protected override void Write(System.IO.BinaryWriter w)
                     if(sect == null)
                     {
                         // default to 0x0
+#if HAVE_SYSTEM
                         Console.WriteLine("Entry point " + EntryPoint +
                             " not found, defaulting to 0x0");
+#endif
                         e_entry = 0;
                     }
                     else
                     {
+#if HAVE_SYSTEM
                         Console.WriteLine("Entry point " + EntryPoint +
                             " not found, defaulting to 0x" +
                             sect.LoadAddress.ToString("X"));
+#endif
                         e_entry = sect.LoadAddress;
                     }
                 }
diff --git a/tymake/Program.cs b/tymake/Program.cs
index 05313046..e11f7587 100644
--- a/tymake/Program.cs
+++ b/tymake/Program.cs
@@ -116,7 +116,10 @@ public TyProject()
             args = new List<FunctionArg> { new FunctionArg { name = "projfile", argtype = Expression.EvalResult.ResultType.String },
                 new FunctionArg { name = "config", argtype = Expression.EvalResult.ResultType.String },
                 new FunctionArg { name = "tools_ver", argtype = Expression.EvalResult.ResultType.String },
-                new FunctionArg { name = "unsafe", argtype = Expression.EvalResult.ResultType.Int } };
+                new FunctionArg { name = "unsafe", argtype = Expression.EvalResult.ResultType.Int },
+                new FunctionArg { name = "imports", argtype = Expression.EvalResult.ResultType.Array },
+                new FunctionArg { name = "ref_overrides", argtype = Expression.EvalResult.ResultType.Array },
+                new FunctionArg { name = "lib_dir", argtype = Expression.EvalResult.ResultType.String } };
         }
 
         public override Expression.EvalResult Run(MakeState s, List<Expression.EvalResult> args)
@@ -133,12 +136,26 @@ public override Expression.EvalResult Run(MakeState s, List<Expression.EvalResul
                 throw new Exception("_typroject: " + fname + " does not exist");
             }
 
+            /* Extract out imports */
+            List<string> imports = new List<string>();
+            foreach (var import in args[4].arrval)
+                imports.Add(import.strval);
+
+            /* Extract out ref overrides */
+            List<string> ref_overrides = new List<string>();
+            foreach (var ro in args[5].arrval)
+                ref_overrides.Add(ro.strval);
+
+
             typroject.Project p = null;
             if (fname.ToLower().EndsWith(".csproj"))
-                p = typroject.Project.xml_read(fi.OpenRead(), config, fi.DirectoryName, cur_dir);
+                p = typroject.Project.xml_read(fi.OpenRead(), config, fi.DirectoryName, cur_dir, imports, ref_overrides);
             else if (fname.ToLower().EndsWith(".sources"))
                 p = typroject.Project.sources_read(fi.OpenRead(), config, fi.DirectoryName, cur_dir);
 
+            if (args[6].strval != "")
+                p.lib_dir = args[6].strval;
+
             Dictionary<string, Expression.EvalResult> ret = new Dictionary<string, Expression.EvalResult>();
             ret["OutputFile"] = new Expression.EvalResult(p.OutputFile);
             ret["OutputType"] = new Expression.EvalResult(p.output_type.ToString());
@@ -150,6 +167,9 @@ public override Expression.EvalResult Run(MakeState s, List<Expression.EvalResul
             ret["ProjectReferences"] = new Expression.EvalResult(new string[] { });
             foreach (typroject.Project pref in p.ProjectReferences)
                 ret["ProjectReferences"].arrval.Add(new Expression.EvalResult(pref.ProjectFile));
+            ret["References"] = new Expression.EvalResult(new string[] { });
+            foreach (var rref in p.References)
+                ret["References"].arrval.Add(new Expression.EvalResult(rref));
             ret["ProjectFile"] = new Expression.EvalResult(fi.FullName);
             ret["ProjectName"] = new Expression.EvalResult(p.ProjectName);
 
@@ -178,6 +198,9 @@ public BuildFunction(typroject.Project proj)
 
             public override Expression.EvalResult Run(MakeState s, List<Expression.EvalResult> passed_args)
             {
+                var o = passed_args[0].objval;
+                p.assembly_name = o["AssemblyName"].strval;
+                
                 return new Expression.EvalResult(p.build(new List<string>(), new List<string>(), new List<string>(), do_unsafe));
             }
         }
diff --git a/tymake/RuleFor.cs b/tymake/RuleFor.cs
index d319c4d8..1820bac6 100644
--- a/tymake/RuleFor.cs
+++ b/tymake/RuleFor.cs
@@ -29,6 +29,27 @@ namespace tymake
 {
     partial class Program
     {
+        internal class RuleForExists : FunctionStatement
+        {
+            public RuleForExists()
+            {
+                name = "rulefor";
+                args = new List<FunctionArg>
+                {
+                    new FunctionArg { name = "output", argtype = Expression.EvalResult.ResultType.String }
+                };
+            }
+
+            public override Expression.EvalResult Run(MakeState s, List<Expression.EvalResult> passed_args)
+            {
+                TyMakeState tms = s as TyMakeState;
+                string wc_pat;
+                if (tms.GetRule(passed_args[0].strval, out wc_pat) == null)
+                    return new Expression.EvalResult(0);
+                else
+                    return new Expression.EvalResult(1);
+            }
+        }
         internal class RuleForFunction : FunctionStatement
         {
             public RuleForFunction()
@@ -187,7 +208,20 @@ public int Build(MakeState s, string tfile, string wc_match)
                 bool to_build = false;
                 System.IO.FileSystemInfo targ_fi = new System.IO.FileInfo(tfile);
                 DateTime targ_lwt = DateTime.Now;
-                if (!Statement.FileDirExists(tfile))
+                if(s.GetDefine("REBUILD_ALL").AsInt != 0 && ((targ_fi.Attributes & System.IO.FileAttributes.Directory) != System.IO.FileAttributes.Directory))
+                {
+                    to_build = true;
+
+                    Console.ForegroundColor = ConsoleColor.Green;
+                    System.Console.WriteLine("Building " + tfile
+#if DEBUG
+                        + " because REBUILD_ALL is set"
+#endif
+                        );
+                    Console.ResetColor();
+
+                }
+                else if (!Statement.FileDirExists(tfile))
                 {
                     to_build = true;
 
@@ -255,7 +289,7 @@ public int Build(MakeState s, string tfile, string wc_match)
                         targ_fi = new System.IO.FileInfo(tfile);
                         if ((targ_fi.Attributes & System.IO.FileAttributes.Directory) == System.IO.FileAttributes.Directory)
                             targ_fi = new System.IO.DirectoryInfo(tfile);
-                        if (targ_fi.Exists == false || targ_fi.LastWriteTime.CompareTo(targ_lwt) <= 0)
+                        if (targ_fi.Exists == false || targ_fi.LastWriteTime.CompareTo(targ_lwt) < 0)
                         {
                             Console.ForegroundColor = ConsoleColor.Red;
                             Console.WriteLine("Rule failed to build " + tfile);
diff --git a/tymake/stdlib.tmh b/tymake/stdlib.tmh
index 1ec6f939..40aa984d 100644
--- a/tymake/stdlib.tmh
+++ b/tymake/stdlib.tmh
@@ -34,15 +34,45 @@ if(!defined(STDLIB_TMH))
 		return downloadextract(uri, member, "");
 	}
 
-
 	export function typroject(string name, string config, string tools_ver, int unsafe)
 	{
-		_p = _typroject(name, config, tools_ver, unsafe);
+		return typroject(name, config, tools_ver, unsafe, [], []);
+	}
+
+	export function typroject(string name, string config, string tools_ver, int unsafe, array imports)
+	{
+		return typroject(name, config, tools_ver, unsafe, imports, []);
+	}
+
+	export function typroject(string name, string config, string tools_ver, int unsafe, array imports, array ref_overrides)
+	{
+		return typroject(name, config, tools_ver, unsafe, imports, ref_overrides, 1);
+	}
+
+	__typroject_loaded = [=];
+
+	export function typrojectfromoutput(string output_name)
+	{
+		return __typroject_loaded.get(output_name);
+	}
+
+	export function typroject(string name, string config, string tools_ver, int unsafe, array imports, array ref_overrides, int add_depends)
+	{
+		TYPROJECT_LIBDIR ?= "";
+
+		_p = _typroject(name, config, tools_ver, unsafe, imports, ref_overrides, TYPROJECT_LIBDIR);
 
 		_depends = [];
-		foreach(dep in _p.ProjectReferences)
+		if(add_depends != 0)
+		{
+			foreach(dep in _p.ProjectReferences)
+			{
+				_depends.add(typroject(dep, config, tools_ver, unsafe, [], ref_overrides));
+			}
+		}
+		if(defined(TYPROJECT_EXTRADEPENDS))
 		{
-			_depends.add(typroject(dep, config, tools_ver, unsafe));
+			_depends.addrange(TYPROJECT_EXTRADEPENDS);
 		}
 
 		_depends.add(dir(_p.OutputFile));
@@ -57,6 +87,7 @@ if(!defined(STDLIB_TMH))
 			mkdir(_RULE_OUTPUT);
 		});
 
+		__typroject_loaded.add(_p.OutputFile, _p);
 		return _p.OutputFile;
 	}
 
diff --git a/tymake/tysos.tmk b/tymake/tysos.tmk
index 8c8a3af3..c630ce9d 100644
--- a/tymake/tysos.tmk
+++ b/tymake/tysos.tmk
@@ -145,21 +145,103 @@ function tobjfromexe(string exe)
 	return dir(exe) + "/" + basefname(exe) + ".to";
 }
 
+TYPROJECT_EXTRADEPENDS = [ THIS ];
+
+
+/* coreclr corlib is distributed amongst several assemblies */
+DOTNETCORLIB = typroject(ROOT + "/coreclr/src/mscorlib/System.Private.CoreLib.csproj", "Release", "4.6.1", 1, [], [], 0);
+dntp = typrojectfromoutput(DOTNETCORLIB);
+dntp.add("AssemblyName", "mscorlib");
+build(DOTNETCORLIB);
+
+/* Copy dotnet corlib output to MSCORLIB */
+MSCORLIB = ROOT + "/coreclr/mscorlib.dll";
+MSCORLIBOBJ = objfromexe(MSCORLIB);
+MSCORLIBDIR = dir(MSCORLIB);
+
+rulefor(MSCORLIB, [ DOTNETCORLIB ], [ THIS ], function()
+{
+	cp(DOTNETCORLIB, MSCORLIB);
+});
+build(MSCORLIB);
+
+
+/* function to build a constituent assembly */
+COREFX_LIB = "corefx/lib";		// place results here
+autodir(COREFX_LIB);
+corefx_projs = [=];
+
+function build_corefx(string name)
+{
+	/* decorate name if it isn't already */
+	if(ext(name) != ".csproj")
+	{
+		name = "corefx/src/" + name + "/src/" + name + ".csproj";
+	}
+
+	if(corefx_projs.containskey(name))
+	{
+		return corefx_projs.get(name);
+	}
+
+	_p = _typroject(name, "Release", "4.6.1", 1, [], [ "mscorlib=$MSCORLIB" ], COREFX_LIB);
+
+	_depends = [];
+	foreach(dep in _p.ProjectReferences)
+	{
+		_depends.add(build_corefx(dep));
+	}
+	foreach(dep in _p.References)
+	{
+		_depends.add(build_corefx("corefx/src/" + dep + "/src/" + dep + ".csproj"));
+	}
+	_depends.add(COREFX_LIB);
+	_depends.add(THIS);
+
+	rulefor(_p.OutputFile, _p.Sources, _depends, function()
+	{
+		_p.Build();
+	});
+
+	_o = COREFX_LIB + "/" + basefname(name) + ".dll";
+	rulefor(_o, [ _p.OutputFile ], [], function()
+	{
+		cp(_RULE_INPUT, _RULE_OUTPUT);
+	});
+
+	corefx_projs.add(name, _o);
+
+	return _o;
+}
+
+/* Build some common ones (pulls in others) - see COREFX_LIB for assemblies produced */
+build(build_corefx("System.Console"));
+build(build_corefx("System.IO.FileSystem"));
+
+/* Build a list of reference assemblies to include in all projects (in future we will do this more cleverly) */
+COREFX_REFS = "";
+foreach(ref in files(COREFX_LIB))
+{
+	COREFX_REFS = COREFX_REFS + ";" + basefname(ref);
+}
+
+/* Make all run-time assemblies depend on the dotnet corlib and this file */
+//TYPROJECT_LIBDIR = COREFX_LIB;
+REF_OVERRIDES = [ ];
+
+
 TYSILAPROJ = ROOT + "/tysila4/tysila4.csproj";
-TYSILA = typroject(TYSILAPROJ, "Release", "4.0", 1);
-TYSOS = typroject(ROOT + "/tysos/tysos.csproj", "Release", "3.5", 1);
+TYSILA = typroject(TYSILAPROJ, "Release", "4.6.1", 1, [], REF_OVERRIDES);
+TYSOS = typroject(ROOT + "/tysos/tysos.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES);
 TYSOSOBJ = objfromexe(TYSOS);
-MSCORLIB = ROOT + "/mono/corlib/mscorlib.dll";
-MSCORLIBOBJ = objfromexe(MSCORLIB);
-LIBSUPCS = typroject(ROOT + "/libsupcs/libsupcs.csproj", "Release", "3.5", 1);
+LIBSUPCS = typroject(ROOT + "/libsupcs/libsupcs.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES);
 LIBSUPCSOBJ = objfromexe(LIBSUPCS);
 LIBSUPCSA = dir(LIBSUPCS) + "/" + basefname(LIBSUPCS) + ".a";
-LIBASMOBJ = objfromexe(typroject(ROOT + "/libasm/libasm.csproj", "Release", "3.5", 1));
-LIBTYSILAOBJ = objfromexe(typroject(ROOT + "/libtysila/libtysila.csproj", "Release", "3.5", 1));
-MSCORLIBDIR = dir(MSCORLIB);
+LIBASMOBJ = objfromexe(typroject(ROOT + "/libasm/libasm.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+LIBTYSILAOBJ = objfromexe(typroject(ROOT + "/libtysila/libtysila.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
 TYSOSDIR = dir(TYSOS);
 LIBSUPCSDIR = dir(LIBSUPCS);
-METADATA = typroject(ROOT + "/metadata/metadata.csproj", "Release", "3.5", 1);
+METADATA = typroject(ROOT + "/metadata/metadata.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES);
 METADATAOBJ = objfromexe(METADATA);
 
 
@@ -185,7 +267,7 @@ KERNEL = ROOT + "/tysos.bin";
 
 /* Rules for char-conversions */
 CC_DIR = ROOT + "/unicode_support/char-conversions";
-CHAR_CONVERSIONS_PROG = typroject(CC_DIR + "/char-conversions.csproj");
+CHAR_CONVERSIONS_PROG = typroject(CC_DIR + "/char-conversions.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES);
 CC_INTERMEDIATE = CC_DIR + "/category-dump";
 CC_OUTPUT = CC_DIR + "/char-conversions.cs";
 
@@ -206,7 +288,7 @@ rulefor(ROOT + "/tysos/lib/char-conversions.cs", [ CC_OUTPUT ], [], function()
 
 /* Rules for UnicodeData */
 US_DIR = ROOT + "/unicode_support";
-US_PROG = typroject(US_DIR + "/unicode_support.csproj");
+US_PROG = typroject(US_DIR + "/unicode_support.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES);
 US_INPUT = US_DIR + "/UnicodeData.txt";
 US_OUTPUT = US_DIR + "/UnicodeData.cs";
 
@@ -220,39 +302,12 @@ rulefor(ROOT + "/tysos/lib/UnicodeData.cs", [ US_OUTPUT ], [], function()
 	cp(_RULE_INPUT, _RULE_OUTPUT);
 });
 
-/* Rules for mscorlib sources */
-CORLIB_DIR = ROOT + "/mono/corlib";
-CORLIB_SRC = CORLIB_DIR + "/corlib.dll.sources";
-CORLIB_OPTS = CORLIB_DIR + "/corlib.dll.sources.options";
-CORLIB_TY_SRCS = CORLIB_DIR + "/corlib.dll.ty.sources";
-CORLIB_DLL = CORLIB_DIR + "/mscorlib.dll";
-
-rulefor(CORLIB_TY_SRCS, [ CORLIB_SRC, CORLIB_OPTS ], [], function()
-{
-	f_a = fopen(CORLIB_OPTS);
-	b_a = [];
-	f_a.Read(b_a, 0, f_a.Length);
-
-	f_b = fopen(CORLIB_SRC);
-	b_b = [];
-	f_b.Read(b_b, 0, f_b.Length);
-
-	b_o = [];
-	b_o.addrange(b_a);
-	b_o.addrange(strtoarr("#assemblyname mscorlib.dll\n\n"));
-	b_o.addrange(b_b);
-
-	f_o = fopen(CORLIB_TY_SRCS);
-	f_o.Write(b_o, 0, b_o.length);
-	f_o.Close();
-});
-
 /* Rules for assembling CLR binaries */
-rulefor("%.obj", [ "%.exe" ], [ TYSILA, CORLIB_DLL, THIS ], function()
+rulefor("%.obj", [ "%.exe" ], [ TYSILA, MSCORLIB, THIS ], function()
 {
 	shellcmd("$TYSILA -o $_RULE_OUTPUT -mno-sse4_1 $TYSILAFLAGS -D -d " + dir(_RULE_OUTPUT) + "/" + basefname(_RULE_OUTPUT) + ".txt -t $TYSILAARCH -q -L$MSCORLIBDIR -L$TYSOSDIR -L" + dir(_RULE_INPUT) + " $_RULE_INPUT");
 });
-rulefor("%.obj", [ "%.dll" ], [ TYSILA, CORLIB_DLL, THIS ], function()
+rulefor("%.obj", [ "%.dll" ], [ TYSILA, MSCORLIB, THIS ], function()
 {
 	shellcmd("$TYSILA -o $_RULE_OUTPUT -mno-sse4_1 $TYSILAFLAGS -D -d " + dir(_RULE_OUTPUT) + "/" + basefname(_RULE_OUTPUT) + ".txt -t $TYSILAARCH -q -L$MSCORLIBDIR -L$TYSOSDIR -L" + dir(_RULE_INPUT) + " $_RULE_INPUT");
 });
@@ -465,10 +520,6 @@ setoutputcolor(["cyan"]);
 print("Building for $TARGET\n");
 setoutputcolor([]);
 
-build(CORLIB_TY_SRCS);
-typroject(CORLIB_TY_SRCS);
-
-
 OUTDIR = ROOT + "/iso_image";
 autodir(OUTDIR);
 ISODIR = OUTDIR + "/iso";
@@ -482,23 +533,23 @@ ISOIMAGE = OUTDIR + "/tysos.iso";
 GRUBCFG = OUTDIR + "/grub.cfg";
 
 // Processes
-DEBUGPRINTOBJ = tobjfromexe(typroject(ROOT + "/testsuite/debugprint/debugprint.csproj"));
-VFSOBJ = tobjfromexe(typroject(ROOT + "/processes/services/vfs/vfs.csproj"));
-ACPIPCOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/acpipc/acpipc.csproj"));
-LOGGEROBJ = tobjfromexe(typroject(ROOT + "/processes/services/logger/logger.csproj"));
-MODFSOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/modfs/modfs.csproj"));
-FSDUMPOBJ = tobjfromexe(typroject(ROOT + "/testsuite/fsdump/fsdump.csproj"));
-PCIOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pci/pci.csproj"));
-BGAOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/bga/bga.csproj"));
-PCIIDEOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pciide/pciide.csproj"));
-ATAOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/ata/ata.csproj"));
-DISKOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/disk/disk.csproj"));
-FRAMEBUFFEROBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/framebuffer/framebuffer.csproj"));
-GUIOBJ = tobjfromexe(typroject(ROOT + "/processes/services/gui/gui.csproj"));
-NETOBJ = tobjfromexe(typroject(ROOT + "/processes/services/net/net.csproj"));
-PCNET32OBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pcnet32/pcnet32.csproj"));
-
-PROCESSES = [ typroject(ROOT + "/testsuite/test_002/test_002.csproj"), DEBUGPRINTOBJ,
+DEBUGPRINTOBJ = tobjfromexe(typroject(ROOT + "/testsuite/debugprint/debugprint.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+VFSOBJ = tobjfromexe(typroject(ROOT + "/processes/services/vfs/vfs.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+ACPIPCOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/acpipc/acpipc.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+LOGGEROBJ = tobjfromexe(typroject(ROOT + "/processes/services/logger/logger.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+MODFSOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/modfs/modfs.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+FSDUMPOBJ = tobjfromexe(typroject(ROOT + "/testsuite/fsdump/fsdump.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+PCIOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pci/pci.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+BGAOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/bga/bga.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+PCIIDEOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pciide/pciide.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+ATAOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/ata/ata.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+DISKOBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/disk/disk.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+FRAMEBUFFEROBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/framebuffer/framebuffer.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+GUIOBJ = tobjfromexe(typroject(ROOT + "/processes/services/gui/gui.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+NETOBJ = tobjfromexe(typroject(ROOT + "/processes/services/net/net.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+PCNET32OBJ = tobjfromexe(typroject(ROOT + "/processes/drivers/pcnet32/pcnet32.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES));
+
+PROCESSES = [ typroject(ROOT + "/testsuite/test_002/test_002.csproj", "Release", "4.6.1", 1, [], REF_OVERRIDES), DEBUGPRINTOBJ,
 	VFSOBJ, ACPIPCOBJ, LOGGEROBJ, MODFSOBJ, FSDUMPOBJ, PCIOBJ, BGAOBJ, PCIIDEOBJ,
 	ATAOBJ, DISKOBJ, FRAMEBUFFEROBJ, GUIOBJ, NETOBJ, PCNET32OBJ ];
 
diff --git a/tymake_lib/Expression.cs b/tymake_lib/Expression.cs
index e75b1633..322f22c2 100644
--- a/tymake_lib/Expression.cs
+++ b/tymake_lib/Expression.cs
@@ -670,6 +670,24 @@ public override EvalResult Evaluate(MakeState s)
                         break;
 
                     case EvalResult.ResultType.Object:
+                        if(m == "11containskeyos")
+                        {
+                            return new EvalResult(elabel.objval.ContainsKey(f.args[0].Evaluate(s).strval) ? 1 : 0);
+                        }
+                        else if(m == "3addoss")
+                        {
+                            elabel.objval[f.args[0].Evaluate(s).strval] = new EvalResult(f.args[1].Evaluate(s).strval);
+                            return new EvalResult();
+                        }
+                        else if(m == "3addoso")
+                        {
+                            elabel.objval[f.args[0].Evaluate(s).strval] = new EvalResult(f.args[1].Evaluate(s).objval);
+                            return new EvalResult();
+                        }
+                        else if(m == "3getos")
+                        {
+                            return elabel.objval[f.args[0].Evaluate(s).strval];
+                        }
                         if (elabel.objval.ContainsKey(m))
                         {
                             EvalResult feval = elabel.objval[m];
@@ -738,20 +756,20 @@ public class FuncCall : Expression
 
         public string Mangle(MakeState s)
         {
-            List<Expression.EvalResult> ers = new List<EvalResult>();
+            List<Expression.EvalResult.ResultType> ers = new List<EvalResult.ResultType>();
             foreach (var arg in args)
-                ers.Add(arg.Evaluate(s));
+                ers.Add(arg.Evaluate(s).Type);
             return Mangle(target, ers);
         }
 
-        public static string Mangle(string target, List<Expression.EvalResult> args)
+        public static string Mangle(string target, List<Expression.EvalResult.ResultType> args)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append(target.Length.ToString());
             sb.Append(target);
             foreach (var e in args)
             {
-                switch (e.Type)
+                switch (e)
                 {
                     case EvalResult.ResultType.Int:
                         sb.Append("i");
@@ -784,7 +802,15 @@ public static string Mangle(string target, List<Expression.EvalResult> args)
 
         public override EvalResult Evaluate(MakeState s)
         {
-            List<string> mangle_all = MangleAll(s);
+            var mangled_name = Mangle(s);
+            if (s.funcs.ContainsKey(mangled_name))
+            {
+                List<EvalResult> args_to_pass = new List<EvalResult>();
+                foreach (Expression arg in args)
+                    args_to_pass.Add(arg.Evaluate(s));
+                return s.funcs[mangled_name].Run(s, args_to_pass);
+            }
+            /*List<string> mangle_all = MangleAll(s);
             foreach (var mangled_name in mangle_all)
             {
                 if (s.funcs.ContainsKey(mangled_name))
@@ -794,53 +820,58 @@ public override EvalResult Evaluate(MakeState s)
                         args_to_pass.Add(arg.Evaluate(s));
                     return s.funcs[mangled_name].Run(s, args_to_pass);
                 }
-            }
+            }*/
 
             throw new Statement.SyntaxException("unable to find function " + Mangle(s));
         }
 
         static Dictionary<string, List<string>> mangle_all_cache = new Dictionary<string, List<string>>();
 
-        private List<string> MangleAll(MakeState s)
+        public static List<string> MangleAll(string target, List<Expression.EvalResult.ResultType> args, MakeState s)
         {
-            var cache_key = Mangle(s);
-            List<string> ret;
-            if (mangle_all_cache.TryGetValue(cache_key, out ret))
-                return ret;
-
-            List<Expression.EvalResult> ers = new List<EvalResult>();
-            foreach (var arg in args)
-                ers.Add(arg.Evaluate(s));
-
-            ret = new List<string>();
+            var ret = new List<string>();
             for(int i = 0; i <= args.Count; i++)
             {
-                MangleAllLine(i, 0, ret, ers);
+                MangleAllLine(target, i, ret, args);
             }
 
-            mangle_all_cache[cache_key] = ret;
             return ret;
         }
 
-        private void MangleAllLine(int total_anys,
-            int cur_anys, List<string> ret,
-            List<Expression.EvalResult> args_in)
+        private static void MangleAllLine(string target, int cur_idx, List<string> ret,
+            List<Expression.EvalResult.ResultType> args_in)
         {
-            if (cur_anys == total_anys)
+            if (cur_idx == args_in.Count)
             {
-                var m = Mangle(target, args_in);
-                if (!ret.Contains(m))
-                    ret.Add(m);
+                // we've reached the end of a chain of changes - add resultant item
+                ret.Add(Mangle(target, args_in));
             }
             else
             {
-                for(int i = 0; i < args_in.Count; i++)
+                if (args_in[cur_idx] == EvalResult.ResultType.Any)
+                {
+                    // We need to produce new arrays for every possible option at this index
+                    // Re-use array because args_in is never changed in MangleAllLine
+                    var new_arr = new List<EvalResult.ResultType>(args_in);
+                    new_arr[cur_idx] = EvalResult.ResultType.Void;
+                    MangleAllLine(target, cur_idx + 1, ret, new_arr);
+
+                    new_arr[cur_idx] = EvalResult.ResultType.String;
+                    MangleAllLine(target, cur_idx + 1, ret, new_arr);
+
+                    new_arr[cur_idx] = EvalResult.ResultType.Object;
+                    MangleAllLine(target, cur_idx + 1, ret, new_arr);
+
+                    new_arr[cur_idx] = EvalResult.ResultType.Int;
+                    MangleAllLine(target, cur_idx + 1, ret, new_arr);
+
+                    new_arr[cur_idx] = EvalResult.ResultType.Array;
+                    MangleAllLine(target, cur_idx + 1, ret, new_arr);
+                }
+                else
                 {
-                    if (args_in[i].Type == EvalResult.ResultType.Any)
-                        continue;
-                    List<EvalResult> new_args_in = new List<EvalResult>(args_in);
-                    new_args_in[i] = new EvalResult { Type = EvalResult.ResultType.Any };
-                    MangleAllLine(total_anys, cur_anys + 1, ret, new_args_in);
+                    // pass on to next item
+                    MangleAllLine(target, cur_idx + 1, ret, args_in);
                 }
             }
         }
diff --git a/tymake_lib/Statement.cs b/tymake_lib/Statement.cs
index 43e7f9ce..6fde97cb 100644
--- a/tymake_lib/Statement.cs
+++ b/tymake_lib/Statement.cs
@@ -113,7 +113,7 @@ public override Expression.EvalResult Execute(MakeState s)
             if (tok_name is LabelExpression)
             {
                 var tn = ((LabelExpression)tok_name).val;
-                s.SetLocalDefine(tn, e);
+                s.SetDefine(tn, e, assignop);
                 if (export)
                     ExportDef(tn, s);
             }
@@ -375,16 +375,23 @@ public override Expression.EvalResult Execute(MakeState s)
         {
             if (name != null)
             {
-                string mangledname = Mangle();
-                s.funcs[mangledname] = this;
+                var arg_types = new List<Expression.EvalResult.ResultType>();
+                foreach (var arg in args)
+                    arg_types.Add(arg.argtype);
+                var mangled_names = FuncCall.MangleAll(name, arg_types, s);
 
-                if (export)
+                foreach (var mangledname in mangled_names)
                 {
-                    MakeState cur_s = s.parent;
-                    while (cur_s != null)
+                    s.funcs[mangledname] = this;
+
+                    if (export)
                     {
-                        cur_s.funcs[mangledname] = this;
-                        cur_s = cur_s.parent;
+                        MakeState cur_s = s.parent;
+                        while (cur_s != null)
+                        {
+                            cur_s.funcs[mangledname] = this;
+                            cur_s = cur_s.parent;
+                        }
                     }
                 }
             }
@@ -408,7 +415,15 @@ public virtual Expression.EvalResult Run(MakeState s, List<Expression.EvalResult
                     fs.args = ofs.args;
                     fs.code = ofs.code;
 
-                    new_s.funcs[fs.Mangle()] = fs;
+
+                    var arg_types = new List<Expression.EvalResult.ResultType>();
+                    foreach (var arg in fs.args)
+                        arg_types.Add(arg.argtype);
+                    var mangledname = FuncCall.Mangle(fs.name, arg_types);
+                    /* var mangled_names = FuncCall.MangleAll(fs.name, arg_types, s);
+
+                    foreach(var mangledname in mangled_names) */
+                        new_s.funcs[mangledname] = fs;
                 }
                 else
                     new_s.SetLocalDefine(args[i].name, passed_args[i]);
@@ -557,9 +572,14 @@ public override Expression.EvalResult Execute(MakeState s)
         {
             var f = include_file.Evaluate(s).strval;
 
+            var saved_this = s.GetDefine("THIS");
+
             MakeState new_s = s.Clone();
+            var ret = TymakeLib.ExecuteFile(f, new_s);
+
+            s.SetDefine("THIS", saved_this, true);
 
-            return TymakeLib.ExecuteFile(f, new_s);
+            return ret;
         }
     }
 }
diff --git a/tymake_lib/tml.conflicts b/tymake_lib/tml.conflicts
index dc335e95..10961a0e 100644
--- a/tymake_lib/tml.conflicts
+++ b/tymake_lib/tml.conflicts
@@ -1,3 +1,3 @@
-// Parser Conflict Information for grammar file "tml.y - 07/05/2017 10:24:52"
+// Parser Conflict Information for grammar file "tml.y - 31/10/2017 22:26:19"
 
 // End conflict information for parser
diff --git a/tymake_lib/tml.cs b/tymake_lib/tml.cs
index 83879430..3b8e51d4 100644
--- a/tymake_lib/tml.cs
+++ b/tymake_lib/tml.cs
@@ -6,7 +6,7 @@
 //
 //  GPLEX Version:  1.2.2
 //  Machine:  DESKTOP-JOHN
-//  DateTime: 07/05/2017 10:24:54
+//  DateTime: 31/10/2017 22:26:21
 //  UserName: jncro
 //  GPLEX input file <tml.lex - 06/05/2017 13:38:51>
 //  GPLEX frame file <embedded resource>
diff --git a/tymake_lib/tml.y b/tymake_lib/tml.y
index fbf850a5..c91f6790 100644
--- a/tymake_lib/tml.y
+++ b/tymake_lib/tml.y
@@ -216,6 +216,7 @@ arglist		:	arglist COMMA arg				{ $$ = new List<FunctionStatement.FunctionArg>($
 
 objexpr		:	LBRACK objlist RBRACK			{ $$ = $2; }
 			|	LBRACK objlist COMMA RBRACK		{ $$ = $2; }
+			|	LBRACK ASSIGN RBRACK				{ $$ = new List<ObjDef>(); }
 			;
 
 objlist		:	objmember						{ $$ = new List<ObjDef> { $1 }; }
diff --git a/tymake_lib/tmlp.cs b/tymake_lib/tmlp.cs
index cc868f71..400965d6 100644
--- a/tymake_lib/tmlp.cs
+++ b/tymake_lib/tmlp.cs
@@ -4,9 +4,9 @@
 
 // GPPG version 1.5.2
 // Machine:  DESKTOP-JOHN
-// DateTime: 07/05/2017 10:24:53
+// DateTime: 31/10/2017 22:26:21
 // UserName: jncro
-// Input file <tml.y - 07/05/2017 10:24:52>
+// Input file <tml.y - 31/10/2017 22:26:19>
 
 // options: conflicts lines gplex conflicts
 
@@ -74,8 +74,8 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
 #pragma warning disable 649
   private static Dictionary<int, string> aliases;
 #pragma warning restore 649
-  private static Rule[] rules = new Rule[109];
-  private static State[] states = new State[193];
+  private static Rule[] rules = new Rule[110];
+  private static State[] states = new State[195];
   private static string[] nonTerms = new string[] {
       "file", "export", "expr", "expr2", "expr3", "expr4", "expr5", "expr6", 
       "expr7", "expr7a", "expr8", "expr9", "expr10", "expr11", "strlabelexpr", 
@@ -86,18 +86,18 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
       "$accept", };
 
   static Parser() {
-    states[0] = new State(new int[]{21,4,65,52,52,58,50,131,37,137,59,144,60,154,62,162,63,168,49,184,39,188,3,-2,48,-20},new int[]{-1,1,-20,3,-21,192,-22,191,-23,8,-24,9,-17,11,-18,60,-16,127,-15,128,-25,136,-29,143,-30,153,-31,161,-32,167,-2,174,-26,182,-27,186});
+    states[0] = new State(new int[]{21,4,65,52,52,58,50,133,37,139,59,146,60,156,62,164,63,170,49,186,39,190,3,-2,48,-20},new int[]{-1,1,-20,3,-21,194,-22,193,-23,8,-24,9,-17,11,-18,60,-16,129,-15,130,-25,138,-29,145,-30,155,-31,163,-32,169,-2,176,-26,184,-27,188});
     states[1] = new State(new int[]{3,2});
     states[2] = new State(-1);
     states[3] = new State(-3);
-    states[4] = new State(new int[]{22,190,65,52,52,58,50,131,37,137,59,144,60,154,62,162,63,168,49,184,39,188,48,-20},new int[]{-21,5,-22,191,-23,8,-24,9,-17,11,-18,60,-16,127,-15,128,-25,136,-29,143,-30,153,-31,161,-32,167,-2,174,-26,182,-27,186});
-    states[5] = new State(new int[]{22,6,65,52,52,58,50,131,37,137,59,144,60,154,62,162,63,168,49,184,39,188,48,-20},new int[]{-22,7,-23,8,-24,9,-17,11,-18,60,-16,127,-15,128,-25,136,-29,143,-30,153,-31,161,-32,167,-2,174,-26,182,-27,186});
+    states[4] = new State(new int[]{22,192,65,52,52,58,50,133,37,139,59,146,60,156,62,164,63,170,49,186,39,190,48,-20},new int[]{-21,5,-22,193,-23,8,-24,9,-17,11,-18,60,-16,129,-15,130,-25,138,-29,145,-30,155,-31,163,-32,169,-2,176,-26,184,-27,188});
+    states[5] = new State(new int[]{22,6,65,52,52,58,50,133,37,139,59,146,60,156,62,164,63,170,49,186,39,190,48,-20},new int[]{-22,7,-23,8,-24,9,-17,11,-18,60,-16,129,-15,130,-25,138,-29,145,-30,155,-31,163,-32,169,-2,176,-26,184,-27,188});
     states[6] = new State(-14);
     states[7] = new State(-17);
     states[8] = new State(-18);
     states[9] = new State(new int[]{30,10});
     states[10] = new State(-21);
-    states[11] = new State(new int[]{16,124,36,125,35,126,25,-6,23,-6},new int[]{-35,12});
+    states[11] = new State(new int[]{16,126,36,127,35,128,25,-6,23,-6},new int[]{-35,12});
     states[12] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,13,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[13] = new State(-36);
     states[14] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-4,15,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
@@ -115,16 +115,16 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     states[26] = new State(new int[]{34,27,33,-60,32,-60,31,-60,30,-60,8,-60,13,-60,24,-60,21,-60});
     states[27] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-7,28,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[28] = new State(-59);
-    states[29] = new State(new int[]{4,30,18,122,34,-63,33,-63,32,-63,31,-63,30,-63,8,-63,13,-63,24,-63,21,-63});
+    states[29] = new State(new int[]{4,30,18,124,34,-63,33,-63,32,-63,31,-63,30,-63,8,-63,13,-63,24,-63,21,-63});
     states[30] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-8,31,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[31] = new State(-61);
-    states[32] = new State(new int[]{26,33,27,116,19,118,20,120,4,-68,18,-68,34,-68,33,-68,32,-68,31,-68,30,-68,8,-68,13,-68,24,-68,21,-68});
+    states[32] = new State(new int[]{26,33,27,118,19,120,20,122,4,-68,18,-68,34,-68,33,-68,32,-68,31,-68,30,-68,8,-68,13,-68,24,-68,21,-68});
     states[33] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-9,34,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[34] = new State(-64);
-    states[35] = new State(new int[]{28,36,29,114,26,-71,27,-71,19,-71,20,-71,4,-71,18,-71,34,-71,33,-71,32,-71,31,-71,30,-71,8,-71,13,-71,24,-71,21,-71});
+    states[35] = new State(new int[]{28,36,29,116,26,-71,27,-71,19,-71,20,-71,4,-71,18,-71,34,-71,33,-71,32,-71,31,-71,30,-71,8,-71,13,-71,24,-71,21,-71});
     states[36] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-10,37,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[37] = new State(-69);
-    states[38] = new State(new int[]{10,39,11,112,28,-74,29,-74,26,-74,27,-74,19,-74,20,-74,4,-74,18,-74,34,-74,33,-74,32,-74,31,-74,30,-74,8,-74,13,-74,24,-74,21,-74});
+    states[38] = new State(new int[]{10,39,11,114,28,-74,29,-74,26,-74,27,-74,19,-74,20,-74,4,-74,18,-74,34,-74,33,-74,32,-74,31,-74,30,-74,8,-74,13,-74,24,-74,21,-74});
     states[39] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-11,40,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[40] = new State(-72);
     states[41] = new State(new int[]{6,42,10,-76,11,-76,28,-76,29,-76,26,-76,27,-76,19,-76,20,-76,4,-76,18,-76,34,-76,33,-76,32,-76,31,-76,30,-76,8,-76,13,-76,24,-76,21,-76});
@@ -135,11 +135,11 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     states[46] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-13,47,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[47] = new State(-78);
     states[48] = new State(-79);
-    states[49] = new State(new int[]{25,50,23,109,6,-80,10,-80,11,-80,28,-80,29,-80,26,-80,27,-80,19,-80,20,-80,4,-80,18,-80,34,-80,33,-80,32,-80,31,-80,30,-80,8,-80,13,-80,24,-80,21,-80});
+    states[49] = new State(new int[]{25,50,23,111,6,-80,10,-80,11,-80,28,-80,29,-80,26,-80,27,-80,19,-80,20,-80,4,-80,18,-80,34,-80,33,-80,32,-80,31,-80,30,-80,8,-80,13,-80,24,-80,21,-80});
     states[50] = new State(new int[]{65,52},new int[]{-18,51,-16,61});
     states[51] = new State(-8);
     states[52] = new State(new int[]{7,53,16,-10,36,-10,35,-10,25,-10,23,-10,6,-10,10,-10,11,-10,28,-10,29,-10,26,-10,27,-10,19,-10,20,-10,4,-10,18,-10,34,-10,33,-10,32,-10,31,-10,30,-10,8,-10,13,-10,24,-10,21,-10});
-    states[53] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96,8,-49,13,-49},new int[]{-33,54,-4,106,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[53] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96,8,-49,13,-49},new int[]{-33,54,-4,108,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
     states[54] = new State(new int[]{8,55,13,56});
     states[55] = new State(-12);
     states[56] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-4,57,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
@@ -150,7 +150,7 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     states[61] = new State(-11);
     states[62] = new State(-81);
     states[63] = new State(-82);
-    states[64] = new State(new int[]{17,44,11,46,52,58,65,107,64,62,23,64,56,71,48,86,58,96,24,-49,13,-49},new int[]{-33,65,-41,97,-4,106,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70,-40,108});
+    states[64] = new State(new int[]{16,106,17,44,11,46,52,58,65,109,64,62,23,64,56,71,48,86,58,96,24,-49,13,-49},new int[]{-33,65,-41,97,-4,108,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70,-40,110});
     states[65] = new State(new int[]{24,66,13,67});
     states[66] = new State(-91);
     states[67] = new State(new int[]{24,68,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-4,57,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
@@ -164,13 +164,13 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     states[75] = new State(-86);
     states[76] = new State(new int[]{51,78,52,79,54,80,55,81,53,82,48,83,57,84},new int[]{-37,77});
     states[77] = new State(-88);
-    states[78] = new State(-101);
-    states[79] = new State(-102);
-    states[80] = new State(-103);
-    states[81] = new State(-104);
-    states[82] = new State(-105);
-    states[83] = new State(-106);
-    states[84] = new State(-107);
+    states[78] = new State(-102);
+    states[79] = new State(-103);
+    states[80] = new State(-104);
+    states[81] = new State(-105);
+    states[82] = new State(-106);
+    states[83] = new State(-107);
+    states[84] = new State(-108);
     states[85] = new State(-89);
     states[86] = new State(new int[]{7,87});
     states[87] = new State(new int[]{51,78,52,79,54,80,55,81,53,82,48,83,57,84,8,-95,13,-95},new int[]{-38,88,-36,95,-37,93});
@@ -180,105 +180,107 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     states[91] = new State(new int[]{51,78,52,79,54,80,55,81,53,82,48,83,57,84},new int[]{-36,92,-37,93});
     states[92] = new State(-93);
     states[93] = new State(new int[]{65,94});
-    states[94] = new State(-108);
+    states[94] = new State(-109);
     states[95] = new State(-94);
     states[96] = new State(-85);
     states[97] = new State(new int[]{24,98,13,99});
     states[98] = new State(-96);
     states[99] = new State(new int[]{24,100,65,102},new int[]{-40,101});
     states[100] = new State(-97);
-    states[101] = new State(-99);
+    states[101] = new State(-100);
     states[102] = new State(new int[]{16,103});
     states[103] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,104,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[104] = new State(-100);
+    states[104] = new State(-101);
     states[105] = new State(-52);
-    states[106] = new State(-48);
-    states[107] = new State(new int[]{7,53,16,103,25,-10,23,-10,6,-10,10,-10,11,-10,28,-10,29,-10,26,-10,27,-10,19,-10,20,-10,4,-10,18,-10,34,-10,33,-10,32,-10,31,-10,24,-10,13,-10});
-    states[108] = new State(-98);
-    states[109] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,110,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[110] = new State(new int[]{24,111});
-    states[111] = new State(-9);
-    states[112] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-11,113,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[113] = new State(-73);
-    states[114] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-10,115,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[115] = new State(-70);
-    states[116] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-9,117,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[117] = new State(-65);
+    states[106] = new State(new int[]{24,107});
+    states[107] = new State(-98);
+    states[108] = new State(-48);
+    states[109] = new State(new int[]{7,53,16,103,25,-10,23,-10,6,-10,10,-10,11,-10,28,-10,29,-10,26,-10,27,-10,19,-10,20,-10,4,-10,18,-10,34,-10,33,-10,32,-10,31,-10,24,-10,13,-10});
+    states[110] = new State(-99);
+    states[111] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,112,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[112] = new State(new int[]{24,113});
+    states[113] = new State(-9);
+    states[114] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-11,115,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[115] = new State(-73);
+    states[116] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-10,117,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[117] = new State(-70);
     states[118] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-9,119,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[119] = new State(-66);
+    states[119] = new State(-65);
     states[120] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-9,121,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[121] = new State(-67);
-    states[122] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-8,123,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[123] = new State(-62);
-    states[124] = new State(-37);
-    states[125] = new State(-38);
-    states[126] = new State(-39);
-    states[127] = new State(new int[]{16,-11,36,-11,35,-11,25,-11,23,-11,30,-34});
-    states[128] = new State(new int[]{25,129,23,109});
-    states[129] = new State(new int[]{65,52},new int[]{-18,51,-16,130});
-    states[130] = new State(new int[]{30,-35,16,-11,36,-11,35,-11,25,-11,23,-11});
-    states[131] = new State(new int[]{65,134,52,58,48,-19},new int[]{-24,132,-17,11,-18,60,-16,61,-15,135});
-    states[132] = new State(new int[]{30,133});
-    states[133] = new State(-22);
-    states[134] = new State(new int[]{7,53,30,-31,16,-10,36,-10,35,-10,25,-10,23,-10});
-    states[135] = new State(new int[]{25,50,23,109});
-    states[136] = new State(-23);
-    states[137] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,138,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[138] = new State(new int[]{21,4},new int[]{-20,139});
-    states[139] = new State(new int[]{38,140,65,-40,52,-40,50,-40,37,-40,59,-40,60,-40,62,-40,63,-40,49,-40,39,-40,48,-40,3,-40,22,-40});
-    states[140] = new State(new int[]{21,4,37,137},new int[]{-20,141,-25,142});
-    states[141] = new State(-41);
-    states[142] = new State(-42);
-    states[143] = new State(-24);
-    states[144] = new State(new int[]{7,145});
-    states[145] = new State(new int[]{65,52,52,58},new int[]{-24,146,-17,11,-18,60,-16,61,-15,135});
-    states[146] = new State(new int[]{30,147});
-    states[147] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,148,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[121] = new State(-66);
+    states[122] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-9,123,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[123] = new State(-67);
+    states[124] = new State(new int[]{17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-8,125,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[125] = new State(-62);
+    states[126] = new State(-37);
+    states[127] = new State(-38);
+    states[128] = new State(-39);
+    states[129] = new State(new int[]{16,-11,36,-11,35,-11,25,-11,23,-11,30,-34});
+    states[130] = new State(new int[]{25,131,23,111});
+    states[131] = new State(new int[]{65,52},new int[]{-18,51,-16,132});
+    states[132] = new State(new int[]{30,-35,16,-11,36,-11,35,-11,25,-11,23,-11});
+    states[133] = new State(new int[]{65,136,52,58,48,-19},new int[]{-24,134,-17,11,-18,60,-16,61,-15,137});
+    states[134] = new State(new int[]{30,135});
+    states[135] = new State(-22);
+    states[136] = new State(new int[]{7,53,30,-31,16,-10,36,-10,35,-10,25,-10,23,-10});
+    states[137] = new State(new int[]{25,50,23,111});
+    states[138] = new State(-23);
+    states[139] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,140,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[140] = new State(new int[]{21,4},new int[]{-20,141});
+    states[141] = new State(new int[]{38,142,65,-40,52,-40,50,-40,37,-40,59,-40,60,-40,62,-40,63,-40,49,-40,39,-40,48,-40,3,-40,22,-40});
+    states[142] = new State(new int[]{21,4,37,139},new int[]{-20,143,-25,144});
+    states[143] = new State(-41);
+    states[144] = new State(-42);
+    states[145] = new State(-24);
+    states[146] = new State(new int[]{7,147});
+    states[147] = new State(new int[]{65,52,52,58},new int[]{-24,148,-17,11,-18,60,-16,61,-15,137});
     states[148] = new State(new int[]{30,149});
-    states[149] = new State(new int[]{65,52,52,58},new int[]{-24,150,-17,11,-18,60,-16,61,-15,135});
-    states[150] = new State(new int[]{8,151});
-    states[151] = new State(new int[]{21,4},new int[]{-20,152});
-    states[152] = new State(-43);
-    states[153] = new State(-25);
-    states[154] = new State(new int[]{7,155});
-    states[155] = new State(new int[]{65,156});
-    states[156] = new State(new int[]{61,157});
-    states[157] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,158,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[158] = new State(new int[]{8,159});
-    states[159] = new State(new int[]{21,4},new int[]{-20,160});
-    states[160] = new State(-44);
-    states[161] = new State(-26);
-    states[162] = new State(new int[]{7,163});
-    states[163] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,164,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[164] = new State(new int[]{8,165});
-    states[165] = new State(new int[]{21,4},new int[]{-20,166});
-    states[166] = new State(-45);
-    states[167] = new State(-27);
-    states[168] = new State(new int[]{21,4},new int[]{-20,169});
-    states[169] = new State(new int[]{62,170});
-    states[170] = new State(new int[]{7,171});
-    states[171] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,172,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[172] = new State(new int[]{8,173});
-    states[173] = new State(-46);
-    states[174] = new State(new int[]{48,176},new int[]{-28,175});
-    states[175] = new State(-28);
-    states[176] = new State(new int[]{65,177});
-    states[177] = new State(new int[]{7,178});
-    states[178] = new State(new int[]{51,78,52,79,54,80,55,81,53,82,48,83,57,84,8,-95,13,-95},new int[]{-38,179,-36,95,-37,93});
-    states[179] = new State(new int[]{8,180,13,91});
-    states[180] = new State(new int[]{21,4},new int[]{-20,181});
-    states[181] = new State(-13);
-    states[182] = new State(new int[]{30,183});
-    states[183] = new State(-29);
-    states[184] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96,30,-33},new int[]{-3,185,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[185] = new State(-32);
-    states[186] = new State(new int[]{30,187});
-    states[187] = new State(-30);
-    states[188] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,189,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
-    states[189] = new State(-50);
-    states[190] = new State(-15);
-    states[191] = new State(-16);
-    states[192] = new State(new int[]{65,52,52,58,50,131,37,137,59,144,60,154,62,162,63,168,49,184,39,188,3,-4,48,-20},new int[]{-22,7,-23,8,-24,9,-17,11,-18,60,-16,127,-15,128,-25,136,-29,143,-30,153,-31,161,-32,167,-2,174,-26,182,-27,186});
+    states[149] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,150,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[150] = new State(new int[]{30,151});
+    states[151] = new State(new int[]{65,52,52,58},new int[]{-24,152,-17,11,-18,60,-16,61,-15,137});
+    states[152] = new State(new int[]{8,153});
+    states[153] = new State(new int[]{21,4},new int[]{-20,154});
+    states[154] = new State(-43);
+    states[155] = new State(-25);
+    states[156] = new State(new int[]{7,157});
+    states[157] = new State(new int[]{65,158});
+    states[158] = new State(new int[]{61,159});
+    states[159] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,160,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[160] = new State(new int[]{8,161});
+    states[161] = new State(new int[]{21,4},new int[]{-20,162});
+    states[162] = new State(-44);
+    states[163] = new State(-26);
+    states[164] = new State(new int[]{7,165});
+    states[165] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,166,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[166] = new State(new int[]{8,167});
+    states[167] = new State(new int[]{21,4},new int[]{-20,168});
+    states[168] = new State(-45);
+    states[169] = new State(-27);
+    states[170] = new State(new int[]{21,4},new int[]{-20,171});
+    states[171] = new State(new int[]{62,172});
+    states[172] = new State(new int[]{7,173});
+    states[173] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,174,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[174] = new State(new int[]{8,175});
+    states[175] = new State(-46);
+    states[176] = new State(new int[]{48,178},new int[]{-28,177});
+    states[177] = new State(-28);
+    states[178] = new State(new int[]{65,179});
+    states[179] = new State(new int[]{7,180});
+    states[180] = new State(new int[]{51,78,52,79,54,80,55,81,53,82,48,83,57,84,8,-95,13,-95},new int[]{-38,181,-36,95,-37,93});
+    states[181] = new State(new int[]{8,182,13,91});
+    states[182] = new State(new int[]{21,4},new int[]{-20,183});
+    states[183] = new State(-13);
+    states[184] = new State(new int[]{30,185});
+    states[185] = new State(-29);
+    states[186] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96,30,-33},new int[]{-3,187,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[187] = new State(-32);
+    states[188] = new State(new int[]{30,189});
+    states[189] = new State(-30);
+    states[190] = new State(new int[]{7,14,17,44,11,46,52,58,65,52,64,62,23,64,56,71,48,86,58,96},new int[]{-3,191,-4,105,-5,17,-6,20,-7,23,-8,26,-9,29,-10,32,-11,35,-12,38,-13,41,-14,48,-15,49,-17,59,-18,60,-16,61,-34,63,-42,69,-19,70});
+    states[191] = new State(-50);
+    states[192] = new State(-15);
+    states[193] = new State(-16);
+    states[194] = new State(new int[]{65,52,52,58,50,133,37,139,59,146,60,156,62,164,63,170,49,186,39,190,3,-4,48,-20},new int[]{-22,7,-23,8,-24,9,-17,11,-18,60,-16,129,-15,130,-25,138,-29,145,-30,155,-31,163,-32,169,-2,176,-26,184,-27,188});
 
     for (int sNo = 0; sNo < states.Length; sNo++) states[sNo].number = sNo;
 
@@ -379,17 +381,18 @@ public partial class Parser: ShiftReduceParser<ValueType, LexLocation>
     rules[95] = new Rule(-38, new int[]{});
     rules[96] = new Rule(-42, new int[]{23,-41,24});
     rules[97] = new Rule(-42, new int[]{23,-41,13,24});
-    rules[98] = new Rule(-41, new int[]{-40});
-    rules[99] = new Rule(-41, new int[]{-41,13,-40});
-    rules[100] = new Rule(-40, new int[]{65,16,-3});
-    rules[101] = new Rule(-37, new int[]{51});
-    rules[102] = new Rule(-37, new int[]{52});
-    rules[103] = new Rule(-37, new int[]{54});
-    rules[104] = new Rule(-37, new int[]{55});
-    rules[105] = new Rule(-37, new int[]{53});
-    rules[106] = new Rule(-37, new int[]{48});
-    rules[107] = new Rule(-37, new int[]{57});
-    rules[108] = new Rule(-36, new int[]{-37,65});
+    rules[98] = new Rule(-42, new int[]{23,16,24});
+    rules[99] = new Rule(-41, new int[]{-40});
+    rules[100] = new Rule(-41, new int[]{-41,13,-40});
+    rules[101] = new Rule(-40, new int[]{65,16,-3});
+    rules[102] = new Rule(-37, new int[]{51});
+    rules[103] = new Rule(-37, new int[]{52});
+    rules[104] = new Rule(-37, new int[]{54});
+    rules[105] = new Rule(-37, new int[]{55});
+    rules[106] = new Rule(-37, new int[]{53});
+    rules[107] = new Rule(-37, new int[]{48});
+    rules[108] = new Rule(-37, new int[]{57});
+    rules[109] = new Rule(-36, new int[]{-37,65});
   }
 
   protected override void Initialize() {
@@ -885,58 +888,63 @@ protected override void DoAction(int action)
                                   { CurrentSemanticValue.objdeflist = ValueStack[ValueStack.Depth-3].objdeflist; }
 #line default
         break;
-      case 98: // objlist -> objmember
-#line 221 "tml.y"
-                          { CurrentSemanticValue.objdeflist = new List<ObjDef> { ValueStack[ValueStack.Depth-1].objdefval }; }
+      case 98: // objexpr -> LBRACK, ASSIGN, RBRACK
+#line 219 "tml.y"
+                             { CurrentSemanticValue.objdeflist = new List<ObjDef>(); }
 #line default
         break;
-      case 99: // objlist -> objlist, COMMA, objmember
+      case 99: // objlist -> objmember
 #line 222 "tml.y"
+                          { CurrentSemanticValue.objdeflist = new List<ObjDef> { ValueStack[ValueStack.Depth-1].objdefval }; }
+#line default
+        break;
+      case 100: // objlist -> objlist, COMMA, objmember
+#line 223 "tml.y"
                                { ValueStack[ValueStack.Depth-3].objdeflist.Add(ValueStack[ValueStack.Depth-1].objdefval); CurrentSemanticValue.objdeflist = ValueStack[ValueStack.Depth-3].objdeflist; }
 #line default
         break;
-      case 100: // objmember -> LABEL, ASSIGN, expr
-#line 225 "tml.y"
+      case 101: // objmember -> LABEL, ASSIGN, expr
+#line 226 "tml.y"
                                  { CurrentSemanticValue.objdefval = new ObjDef { name = ValueStack[ValueStack.Depth-3].strval, val = ValueStack[ValueStack.Depth-1].exprval }; }
 #line default
         break;
-      case 101: // argtype -> INTEGER
-#line 229 "tml.y"
+      case 102: // argtype -> INTEGER
+#line 230 "tml.y"
                          { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Int; }
 #line default
         break;
-      case 102: // argtype -> STRING
-#line 230 "tml.y"
+      case 103: // argtype -> STRING
+#line 231 "tml.y"
                   { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.String; }
 #line default
         break;
-      case 103: // argtype -> ARRAY
-#line 231 "tml.y"
+      case 104: // argtype -> ARRAY
+#line 232 "tml.y"
                  { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Array; }
 #line default
         break;
-      case 104: // argtype -> OBJECT
-#line 232 "tml.y"
+      case 105: // argtype -> OBJECT
+#line 233 "tml.y"
                   { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Object; }
 #line default
         break;
-      case 105: // argtype -> VOID
-#line 233 "tml.y"
+      case 106: // argtype -> VOID
+#line 234 "tml.y"
                 { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Void; }
 #line default
         break;
-      case 106: // argtype -> FUNCTION
-#line 234 "tml.y"
+      case 107: // argtype -> FUNCTION
+#line 235 "tml.y"
                    { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Function; }
 #line default
         break;
-      case 107: // argtype -> ANY
-#line 235 "tml.y"
+      case 108: // argtype -> ANY
+#line 236 "tml.y"
                 { CurrentSemanticValue.typeval = Expression.EvalResult.ResultType.Any; }
 #line default
         break;
-      case 108: // arg -> argtype, LABEL
-#line 238 "tml.y"
+      case 109: // arg -> argtype, LABEL
+#line 239 "tml.y"
                           { CurrentSemanticValue.argval = new FunctionStatement.FunctionArg { name = ValueStack[ValueStack.Depth-1].strval, argtype = ValueStack[ValueStack.Depth-2].typeval }; }
 #line default
         break;
@@ -954,7 +962,7 @@ protected override string TerminalToString(int terminal)
         return CharToString((char)terminal);
   }
 
-#line 242 "tml.y"
+#line 243 "tml.y"
 
 internal Statement output;
 #line default
diff --git a/typroject/Expression.cs b/typroject/Expression.cs
index fcece7de..ff73268f 100644
--- a/typroject/Expression.cs
+++ b/typroject/Expression.cs
@@ -291,7 +291,10 @@ public override EvalResult Evaluate(MakeState s)
             if(arglist != null)
                 throw new NotImplementedException();
 
-            return new EvalResult(s.props[val]);
+            if (!s.props.ContainsKey(val))
+                return new EvalResult("");
+            else
+                return new EvalResult(s.props[val]);
         }
     }
 
@@ -330,6 +333,23 @@ public override EvalResult Evaluate(MakeState s)
         }
     }
 
+    internal class HasTrailingSlashExpression : Expression
+    {
+        public Expression val;
+
+        public override EvalResult Evaluate(MakeState s)
+        {
+            var v = val.Evaluate(s).strval;
+
+            v = Program.replace_dir_split(v);
+
+            if (v.EndsWith("/") || v.EndsWith("\\"))
+                return new EvalResult(1);
+            else
+                return new EvalResult(0);
+        }
+    }
+
     internal class StaticExpression : Expression
     {
         public string type;
diff --git a/typroject/GenerateResourcesCode.cs b/typroject/GenerateResourcesCode.cs
index 944718fc..67739b04 100644
--- a/typroject/GenerateResourcesCode.cs
+++ b/typroject/GenerateResourcesCode.cs
@@ -36,6 +36,9 @@ public bool Execute()
             {
                 _resourcesName = "FxResources." + AssemblyName;
 
+                // ensure output directory exists
+                typroject.Project.create_directory(OutputSourceFilePath);
+
                 using (_targetStream = File.CreateText(OutputSourceFilePath))
                 {
                     if (String.Equals(Path.GetExtension(OutputSourceFilePath), ".vb", StringComparison.OrdinalIgnoreCase))
diff --git a/typroject/Program.cs b/typroject/Program.cs
index b29826dd..4b006d27 100644
--- a/typroject/Program.cs
+++ b/typroject/Program.cs
@@ -384,6 +384,8 @@ public static string ref_dir(string tools_ver)
             else
             {
                 double tvd;
+                if (tools_ver.StartsWith("v"))
+                    tools_ver = tools_ver.Substring(1);
                 if (double.TryParse(tools_ver, out tvd) && tvd >= 12.0)
                 {
                     // this is a visual studio version and libs are in program files/msbuild/x
@@ -391,6 +393,11 @@ public static string ref_dir(string tools_ver)
                     return ret;
                 }
 
+                /* Get from the Reference Assemblies folder */
+                var ref_ass_path = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + "\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v" + tools_ver + "\\mscorlib.dll";
+                var rap_fi = new FileInfo(ref_ass_path);
+                if (rap_fi.Exists)
+                    return rap_fi.DirectoryName;
 
                 string fwork_ver;
                 if (tools_ver == "4.5")
@@ -431,6 +438,7 @@ public class Project
         internal Uri uri_basedir, uri_curdir;
         internal Dictionary<string, string> properties;
         public string tools_ver;
+        public string lib_dir;
         public OutputType output_type;
         public string assembly_name;
         public string extra_add;
@@ -444,7 +452,9 @@ public class Project
         internal XmlNamespaceManager nm;
         internal Dictionary<string, XPathNavigator> targets = new Dictionary<string, XPathNavigator>();
         internal Dictionary<string, List<string>> items = new Dictionary<string, List<string>>();
-        internal Dictionary<string, object> tasks = new Dictionary<string, object>();
+        internal Dictionary<string, Type> tasks = new Dictionary<string, Type>();
+
+        internal Dictionary<string, string> reference_overrides = null;
 
         public string ErrorMessage;
 
@@ -454,10 +464,10 @@ public Project(string filename, string name, Guid guid)
 
         public enum OutputType { Exe, Library };
 
-        public static Project xml_read(Stream file, string config, string basedir, string curdir)
+        public static Project xml_read(Stream file, string config, string basedir, string curdir, List<string> imports = null, List<string> ref_overrides = null)
         {
             Project ret = new Project();
-            return xml_read(ret, file, config, basedir, curdir);
+            return xml_read(ret, file, config, basedir, curdir, null, imports, ref_overrides);
         }
 
         public static Project sources_read(Stream file, string config, string basedir, string curdir)
@@ -568,7 +578,8 @@ internal static Project src_read(List<string> sources, string curdir, OutputType
             return ret;
         }
 
-        internal static Project xml_read(Project ret, Stream file, string config, string basedir, string curdir, Dictionary<string, string> props = null)
+        internal static Project xml_read(Project ret, Stream file, string config, string basedir, string curdir, Dictionary<string, string> props = null,
+            List<string> imports = null, List<string> ref_overrides = null)
         {
             /* Load a project from the project file specified */
             basedir = add_dir_split(basedir);
@@ -576,10 +587,25 @@ internal static Project xml_read(Project ret, Stream file, string config, string
             Uri uri_basedir = new Uri(basedir);
             Uri uri_curdir = new Uri(curdir);
 
+            /* Reference overrides are of the form assembly_name = path */
+            if (ref_overrides != null)
+            {
+                if (ret.reference_overrides == null)
+                    ret.reference_overrides = new Dictionary<string, string>();
+                foreach(var ro in ref_overrides)
+                {
+                    var ros = ro.Split('=');
+                    ret.reference_overrides[ros[0].Trim()] = ros[1].Trim();
+                }
+            }
+
             XPathDocument r = new XPathDocument(file);
             XPathNavigator n = r.CreateNavigator();
-            n.MoveToRoot();
-            n.MoveToFirstChild();
+            foreach(XPathNavigator cn in n.SelectChildren(XPathNodeType.Element))
+            {
+                n = cn;
+                break;
+            }
             XmlNamespaceManager nm = new XmlNamespaceManager(n.NameTable);
             nm.AddNamespace("d", n.NamespaceURI);
 
@@ -605,10 +631,15 @@ internal static Project xml_read(Project ret, Stream file, string config, string
 
                 props["__BuildOS"] = "Linux";
                 props["__BuildArch"] = "x64";
+                props["OSGroup"] = "Linux";
+                props["TargetsUnix"] = "true";
+
+                props["Configuration"] = config;
 
                 is_proj = true;
 
-                ret.tasks["GenerateResourcesCode"] = new Microsoft.DotNet.Build.Tasks.GenerateResourcesCode();
+                ret.tasks["GenerateResourcesCode"] = typeof(Microsoft.DotNet.Build.Tasks.GenerateResourcesCode);
+
             }
             ret.properties = props;
 
@@ -628,8 +659,15 @@ internal static Project xml_read(Project ret, Stream file, string config, string
                     props["MSBuildProjectFullPath"] = props["MSBuildThisFileFullPath"];
                     props["MSBuildProjectName"] = props["MSBuildThisFileName"];
                     props["MSBuildProjectExtension"] = props["MSBuildThisFileExtension"];
-                    props["MSBuildProjectDirectory"] = props["MSBuildThisFileDirectory"];
-                    props["MSBuildProjectDirectoryNoRoot"] = props["MSBuildThisFileDirectoryNoRoot"];
+                    props["MSBuildProjectDirectory"] = remove_dir_split(props["MSBuildThisFileDirectory"]);
+                    props["MSBuildProjectDirectoryNoRoot"] = remove_dir_split(props["MSBuildThisFileDirectoryNoRoot"]);
+
+                    if (fsi.Name == "System.Private.CoreLib.csproj")
+                    {
+                        props["MSBuildProjectName"] = "mscorlib";
+                        props["OutputFile"] = "mscorlib.dll";
+                        props["AssemblyName"] = "mscorlib";
+                    }
 
                     var deftargs = n.SelectSingleNode("@DefaultTargets", nm);
                     if(deftargs != null)
@@ -639,6 +677,15 @@ internal static Project xml_read(Project ret, Stream file, string config, string
                 }
             }
 
+            /* process any imports */
+            if(imports != null)
+            {
+                foreach(var import in imports)
+                {
+                    //process_import(new FileInfo(import), ret);
+                }
+            }
+
             /* Iterate through all child nodes */
             foreach (XPathNavigator cn in n.Select("child::*", nm))
             {
@@ -664,7 +711,18 @@ internal static Project xml_read(Project ret, Stream file, string config, string
                 ret.output_type = OutputType.Exe;
             else
                 throw new Exception("Unknown output type: " + otype);
-            ret.assembly_name = props["AssemblyName"];
+
+            try
+            {
+                if (props["MSBuildProjectName"] == "mscorlib")
+                    ret.assembly_name = "mscorlib";
+                else
+                    ret.assembly_name = props["AssemblyName"];
+            }
+            catch(KeyNotFoundException)
+            {
+                ret.assembly_name = props["MSBuildProjectName"];
+            }
 
             if (ret.ProjectName == null)
                 ret.ProjectName = ret.assembly_name;
@@ -761,14 +819,20 @@ private static void process_node(XPathNavigator n, Project ret, Dictionary<strin
                             {
                                 if(process_condition(cn, props, nm))
                                 {
-                                    process_node(cn, ret, props, nm);
+                                    foreach (XPathNavigator wcn in cn.Select("child::*", nm))
+                                    {
+                                        process_node(wcn, ret, props, nm);
+                                    }
                                     when_done = true;
                                     break;
                                 }
                             }
                             else if(cn.Name == "Otherwise" && !when_done)
                             {
-                                process_node(cn, ret, props, nm);
+                                foreach (XPathNavigator wcn in cn.Select("child::*", nm))
+                                {
+                                    process_node(wcn, ret, props, nm);
+                                }
                                 when_done = true;
                                 break;
                             }
@@ -797,7 +861,7 @@ private static void process_item(XPathNavigator n, Project ret, Dictionary<strin
         {
             if(process_condition(n, props, nm))
             {
-                if(n.Name == "Compile")
+                if (n.Name == "Compile")
                 {
                     var dependsn = n.SelectSingleNode("@DependentUpon", nm);
                     if (dependsn != null)
@@ -807,13 +871,33 @@ private static void process_item(XPathNavigator n, Project ret, Dictionary<strin
                         throw new NotImplementedException();
                     var fname = process_string(n.SelectSingleNode("@Include", nm).Value, props);
 
-                    if (fname.Contains("SafeFileHandle.Windows"))
-                        System.Diagnostics.Debugger.Break();
-
                     var rp = rel_path(fname, ret.uri_basedir, ret.uri_curdir);
-                    if(!ret.Sources.Contains(rp))
+                    if (!ret.Sources.Contains(rp))
                         ret.Sources.Add(rp);
                 }
+                else if(n.Name == "ProjectReference")
+                {
+                    var prfname = rel_path(process_string(n.SelectSingleNode("@Include", nm).Value, props, ret.items), ret.uri_basedir, ret.uri_curdir);
+
+                    Project pref = new Project();
+
+                    var prguidn = n.SelectSingleNode("./d:Project", nm);
+                    if(prguidn != null)
+                        pref.Guid = new Guid(process_string(prguidn.Value, props, ret.items));
+                    var prnamen = n.SelectSingleNode("./d:Name", nm);
+                    if(prnamen != null)
+                        pref.ProjectName = process_string(prnamen.Value, props, ret.items);
+
+                    pref.ProjectFile = prfname;
+                    FileInfo pref_fi = new FileInfo(pref.ProjectFile);
+                    xml_read(pref, pref_fi.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite), ret.configuration, pref_fi.DirectoryName, ret.curdir);
+                    ret.ProjectReferences.Add(pref);
+                }
+                else if(n.Name == "Reference")
+                {
+                    var rname = process_string(n.SelectSingleNode("@Include", nm).Value, props, ret.items);
+                    ret.References.Add(rname);
+                }
                 else
                 {
                     // Silently ignore
@@ -846,7 +930,7 @@ private static void process_property(XPathNavigator n, Project ret, Dictionary<s
         {
             if(process_condition(n, props, nm))
             {
-                props[n.Name] = process_string(n.Value, props);
+                props[n.Name] = process_string(n.Value, props, ret.items);
             }
         }
 
@@ -858,34 +942,10 @@ private static void process_import(XPathNavigator n, Project ret, Dictionary<str
                 var pname = proj.Value;
                 pname = process_string(pname, props);
 
-                var pfi = new FileInfo(pname);
+                var pfi = new FileInfo(rel_path(pname, ret.uri_basedir, ret.uri_curdir));
                 if(pfi.Exists)
                 {
-                    /* Save all the 'msbuildthisfile' properties */
-                    var fp = props["MSBuildThisFileFullPath"];
-                    var fn = props["MSBuildThisFileName"];
-                    var fe = props["MSBuildThisFileExtension"];
-                    var fd = props["MSBuildThisFileDirectory"];
-                    var fdnr = props["MSBuildThisFileDirectoryNoRoot"];
-
-                    /* save curdir/basedir */
-                    var cd = ret.curdir;
-                    var ucd = ret.uri_curdir;
-                    var ubd = ret.uri_basedir;
-                    
-                    xml_read(ret, pfi.OpenRead(), ret.configuration, pfi.DirectoryName, ret.curdir, props);
-
-                    /* Restore thiffile properties */
-                    props["MSBuildThisFileFullPath"] = fp;
-                    props["MSBuildThisFileName"] = fn;
-                    props["MSBuildThisFileExtension"] = fe;
-                    props["MSBuildThisFileDirectory"] = fd;
-                    props["MSBuildThisFileDirectoryNoRoot"] = fdnr;
-
-                    /* Restore curdir/basedir */
-                    ret.curdir = cd;
-                    ret.uri_curdir = ucd;
-                    ret.uri_basedir = ubd;
+                    process_import(pfi, ret);
                 }
                 else
                 {
@@ -893,10 +953,41 @@ private static void process_import(XPathNavigator n, Project ret, Dictionary<str
             }
         }
 
+        private static void process_import(FileInfo pfi, Project ret)
+        {
+            /* Save all the 'msbuildthisfile' properties */
+            var fp = ret.properties["MSBuildThisFileFullPath"];
+            var fn = ret.properties["MSBuildThisFileName"];
+            var fe = ret.properties["MSBuildThisFileExtension"];
+            var fd = ret.properties["MSBuildThisFileDirectory"];
+            var fdnr = ret.properties["MSBuildThisFileDirectoryNoRoot"];
+
+            /* save curdir/basedir */
+            var cd = ret.curdir;
+            var ucd = ret.uri_curdir;
+            var ubd = ret.uri_basedir;
+
+            xml_read(ret, pfi.OpenRead(), ret.configuration, pfi.DirectoryName, ret.curdir, ret.properties);
+
+            /* Restore thiffile properties */
+            ret.properties["MSBuildThisFileFullPath"] = fp;
+            ret.properties["MSBuildThisFileName"] = fn;
+            ret.properties["MSBuildThisFileExtension"] = fe;
+            ret.properties["MSBuildThisFileDirectory"] = fd;
+            ret.properties["MSBuildThisFileDirectoryNoRoot"] = fdnr;
+
+            /* Restore curdir/basedir */
+            ret.curdir = cd;
+            ret.uri_curdir = ucd;
+            ret.uri_basedir = ubd;
+        }
+
         internal static string process_string(string value, Dictionary<string, string> props, Dictionary<string, List<string>> items = null)
         {
             StringBuilder ret = new StringBuilder();
 
+            int substituted = 0;
+
             for(int i = 0; i < value.Length;)
             {
                 bool is_item = false;
@@ -909,7 +1000,10 @@ internal static string process_string(string value, Dictionary<string, string> p
                     i++;
 
                     if (value[i] != '(')
-                        throw new NotSupportedException();
+                    {
+                        ret.Append(value[i - 1]);
+                        continue;
+                    }
                     i++;
 
                     int bcount = 1;     // brackets count to get nested variables
@@ -967,12 +1061,18 @@ internal static string process_string(string value, Dictionary<string, string> p
                         }
                         else
                             throw new NotImplementedException();
+
+                        substituted++;
                     }
                     else if (!is_item && props.ContainsKey(vn))
+                    {
                         ret.Append(props[vn]);
-                    else if(is_item && items.ContainsKey(vn))
+                        substituted++;
+                    }
+                    else if (is_item && items.ContainsKey(vn))
                     {
                         ret.Append(string.Join(";", items[vn]));
+                        substituted++;
                     }
                 }
                 else
@@ -982,7 +1082,12 @@ internal static string process_string(string value, Dictionary<string, string> p
                 }
             }
 
-            return ret.ToString();
+            // handle nested defines
+            var r = ret.ToString();
+            if (substituted != 0 && (r.Contains("$") || (r.Contains("@") && items != null)))
+                return process_string(r, props, items);
+            else
+                return r;
         }
 
         private static bool process_condition(XPathNavigator n, Dictionary<string, string> props, XmlNamespaceManager nm)
@@ -1018,6 +1123,11 @@ internal static string add_dir_split(string dir)
                 return dir + System.IO.Path.DirectorySeparatorChar;
         }
 
+        internal static string remove_dir_split(string dir)
+        {
+            return dir.TrimEnd(Path.DirectorySeparatorChar);
+        }
+
         internal static string remove_drive(string dir)
         {
             if (dir.Length > 2 && dir[1] == ':' && char.IsLetter(dir[0]))
@@ -1053,6 +1163,30 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
         public int build(List<string> extra_defines, List<string> extra_libdirs, List<string> extra_libs, bool do_unsafe,
             System.IO.TextWriter output, string tools_ver_override)
         {
+            /* Set AssemblyName to what it has been defined as */
+            properties["AssemblyName"] = assembly_name;
+            properties["AssemblyTitle"] = assembly_name;
+
+            /* Ensure output paths exist */
+            if (properties.ContainsKey("OutputPath"))
+                create_directory(new DirectoryInfo(properties["OutputPath"]));
+            if (properties.ContainsKey("IntermediateOutputPath"))
+                create_directory(new DirectoryInfo(properties["IntermediateOutputPath"]));
+
+            /* Run any PrepareForBuild target */
+            if (targets.ContainsKey("PrepareForBuild"))
+            {
+                process_node(targets["PrepareForBuild"], this, properties, nm);
+            }
+
+            /*foreach(var k in properties.Keys)
+            {
+                if(k.Contains("DependsOn"))
+                {
+                    var v = properties[k];
+                    Console.WriteLine(k + ": " + process_string(v, properties, items));
+                }
+            }*/
             /* First handle any custom build actions */
             if (properties.ContainsKey("PrepareResourcesDependsOn"))
                 process_dependson(properties["PrepareResourcesDependsOn"]);
@@ -1128,19 +1262,35 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
                 sb.Append("\" ");
             }
 
-            sb.Append("/lib:\"");
             string tvd = Program.ref_dir(tools_ver);
-            if (tvd.EndsWith("\\"))
-                tvd = tvd.Substring(0, tvd.Length - 1);
-            sb.Append(tvd);
-            sb.Append("\" ");
+            /* Reference the tools directory if mscorlib is not overridden */
+            if (lib_dir != null || reference_overrides == null || !reference_overrides.ContainsKey("mscorlib"))
+            {
+                if (lib_dir != null)
+                    tvd = lib_dir;
+
+                sb.Append("/lib:\"");
+                if (tvd.EndsWith("\\"))
+                    tvd = tvd.Substring(0, tvd.Length - 1);
+                sb.Append(tvd);
+                sb.Append("\" ");
+            }
 
             /* Directly reference mscorlib in the appropriate tools dir.
              * This helps v4+ compilers target the correct framework */
+            Dictionary<string, bool> ro_added = new Dictionary<string, bool>();
             if (is_v4plus && get_prop("NoStdLib", properties).ToLower() != "true")
             {
                 sb.Append("/nostdlib ");
-                sb.Append("/r:" + add_dir_split(tvd) + "mscorlib.dll ");
+
+                if (reference_overrides != null && reference_overrides.ContainsKey("mscorlib"))
+                {
+                    foreach (var ro in get_reference_overrides(reference_overrides["mscorlib"], "mscorlib"))
+                        sb.Append("/r:" + ro + " ");
+                    ro_added["mscorlib"] = true;
+                }
+                else
+                    sb.Append("/r:\"" + Program.replace_dir_split(add_dir_split(tvd)) + "mscorlib.dll\" ");
             }
 
             foreach (string lib in extra_libs)
@@ -1152,14 +1302,51 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
                 sb.Append(ld); sb.Append("\" ");
             }
 
+            /* First, replace those project declared references we are using with overrides if necessary */
+            List<string> new_refs = new List<string>();
             foreach (string lib in References)
             {
-                sb.Append("/reference:\"");
-                sb.Append(Program.replace_dir_split(lib));
-                if (lib.Contains(".dll") || lib.Contains(".exe"))
-                    sb.Append("\" ");
+                var lib2 = Program.replace_dir_split(lib);
+                if (reference_overrides != null && reference_overrides.ContainsKey(lib2))
+                {
+                    if (ro_added.ContainsKey(lib2))
+                        continue;
+
+                    foreach (var ro in get_reference_overrides(reference_overrides[lib2], lib2))
+                        new_refs.Add(ro);
+
+                    ro_added[lib2] = true;
+                }
                 else
-                    sb.Append(".dll\" ");
+                    new_refs.Add("\"" + lib2 + "\"");
+            }
+
+            /* Next add overrides that are unaccounted for */
+            if(reference_overrides != null)
+            {
+                foreach(var kvp in reference_overrides)
+                {
+                    if (!ro_added.ContainsKey(kvp.Key))
+                    {
+                        foreach(var ro in get_reference_overrides(kvp.Value, kvp.Key))
+                            new_refs.Add(ro);
+                        ro_added[kvp.Key] = true;
+                    }
+                }
+            }
+
+            /* Finally add to the build command */
+
+            foreach(var lib in new_refs)
+            { 
+                sb.Append("/r:");
+                var lref = Program.replace_dir_split(lib);
+                if(!lref.Contains(".dll") && !lref.Contains(".exe"))
+                {
+                    lref = lib.TrimEnd('\"') + ".dll\"";
+                }
+                sb.Append(lref);
+                sb.Append(" ");
             }
 
             foreach (Project pref in ProjectReferences)
@@ -1205,6 +1392,7 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
                 }
             }
 
+            string old_cmd_args = cmd_args;
             if ((csc_cmd.Length + cmd_args.Length > 2080) || use_response)
             {
                 System.DateTime now = System.DateTime.Now;
@@ -1216,6 +1404,10 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
                 cmd_args = "/nologo /noconfig @" + cmd_file;
             }
 
+#if DEBUG
+            Console.WriteLine("Performing csc build step for " + OutputFile);
+#endif
+
             System.Diagnostics.Process c_proc = new System.Diagnostics.Process();
             c_proc.EnableRaisingEvents = false;
             c_proc.StartInfo.FileName = csc_cmd;
@@ -1252,6 +1444,13 @@ public int build(List<string> extra_defines, List<string> extra_libdirs, List<st
             return 0;
         }
 
+        private IEnumerable<string> get_reference_overrides(string joined, string override_name)
+        {
+            var ros = joined.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var ro in ros)
+                yield return "\"" + ro.Trim() + "\"";
+        }
+
         private void process_dependson(string v)
         {
             var ts = v.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
@@ -1317,17 +1516,18 @@ private static void process_task(XPathNavigator n, Project project, Dictionary<s
                 else if (project.tasks.ContainsKey(n.Name))
                 {
                     // Fill in appropriate properties
-                    var obj = project.tasks[n.Name];
+                    var t = project.tasks[n.Name];
+                    var obj = t.GetConstructor(Type.EmptyTypes).Invoke(null);
                     foreach(XPathNavigator anode in n.Select("@*", nm))
                     {
                         var aname = anode.Name;
                         var atext = process_string(anode.Value, props, project.items);
 
-                        var pi = obj.GetType().GetProperty(aname);
+                        var pi = t.GetProperty(aname);
                         pi.SetValue(obj, atext);
                     }
 
-                    var ret = obj.GetType().GetMethod("Execute").Invoke(obj, null);
+                    var ret = t.GetMethod("Execute").Invoke(obj, null);
                     if ((bool)ret == false)
                         throw new Exception();
                 }
@@ -1354,7 +1554,20 @@ private void gen_res_code(XPathNavigator n, XmlNamespaceManager nm)
             throw new NotImplementedException();
         }
 
-        private static void create_directory(DirectoryInfo directory)
+        internal static void create_directory(FileInfo f)
+        {
+            create_directory(f.Directory);
+        }
+
+        internal static void create_directory(string fname)
+        {
+            FileInfo fi = new FileInfo(fname);
+            if (fi.Exists)
+                return;
+            create_directory(fi);
+        }
+
+        internal static void create_directory(DirectoryInfo directory)
         {
             if (directory.Exists)
                 return;
diff --git a/typroject/typ.conflicts b/typroject/typ.conflicts
index 6fc4f782..89f7ac22 100644
--- a/typroject/typ.conflicts
+++ b/typroject/typ.conflicts
@@ -1,3 +1,3 @@
-// Parser Conflict Information for grammar file "typ.y - 30/10/2017 11:40:14"
+// Parser Conflict Information for grammar file "typ.y - 30/10/2017 19:28:33"
 
 // End conflict information for parser
diff --git a/typroject/typ.cs b/typroject/typ.cs
index dbf01c23..4a532e3d 100644
--- a/typroject/typ.cs
+++ b/typroject/typ.cs
@@ -6,9 +6,9 @@
 //
 //  GPLEX Version:  1.2.2
 //  Machine:  DESKTOP-JOHN
-//  DateTime: 30/10/2017 11:40:17
+//  DateTime: 30/10/2017 19:28:36
 //  UserName: jncro
-//  GPLEX input file <typ.lex - 30/10/2017 11:39:26>
+//  GPLEX input file <typ.lex - 30/10/2017 18:44:18>
 //  GPLEX frame file <embedded resource>
 //
 //  Option settings: parser, minimize
@@ -123,8 +123,8 @@ internal sealed partial class Scanner : ScanBase
         
         enum Result {accept, noMatch, contextFound};
 
-        const int maxAccept = 49;
-        const int initial = 50;
+        const int maxAccept = 65;
+        const int initial = 66;
         const int eofNum = 0;
         const int goStart = -1;
         const int INITIAL = 0;
@@ -163,11 +163,11 @@ struct Table {
         }
     };
 
-    static int[] startState = new int[] {50, 53, 0};
+    static int[] startState = new int[] {66, 69, 0};
 
-    static Table[] NxS = new Table[54] {
+    static Table[] NxS = new Table[70] {
 /* NxS[   0] */ new Table(0, 0, 0, null),
-/* NxS[   1] */ new Table(61, 1, -1, new sbyte[] {40}),
+/* NxS[   1] */ new Table(61, 1, -1, new sbyte[] {56}),
 /* NxS[   2] */ new Table(0, 0, -1, null),
 /* NxS[   3] */ new Table(0, 0, -1, null),
 /* NxS[   4] */ new Table(0, 0, -1, null),
@@ -177,14 +177,14 @@ struct Table {
 /* NxS[   8] */ new Table(0, 0, -1, null),
 /* NxS[   9] */ new Table(48, 10, -1, new sbyte[] {9, 9, 9, 9, 9, 9, 
           9, 9, 9, 9}),
-/* NxS[  10] */ new Table(61, 1, -1, new sbyte[] {38}),
-/* NxS[  11] */ new Table(61, 1, -1, new sbyte[] {36}),
+/* NxS[  10] */ new Table(61, 1, -1, new sbyte[] {54}),
+/* NxS[  11] */ new Table(61, 1, -1, new sbyte[] {52}),
 /* NxS[  12] */ new Table(0, 0, -1, null),
 /* NxS[  13] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 34, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 50, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 34, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 50, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  14] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
@@ -195,45 +195,45 @@ struct Table {
 /* NxS[  15] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 29, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 45, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 29, 14, 14}),
+          14, 14, 45, 14, 14}),
 /* NxS[  16] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 25, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 41, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 25, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 41, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  17] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 24, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 24, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 26, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 26, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  18] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 21, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 25, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 21, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 25, 14, 14, 14, 
           14, 14, 14, 14, 14}),
-/* NxS[  19] */ new Table(0, 0, -1, null),
-/* NxS[  20] */ new Table(0, 0, -1, null),
-/* NxS[  21] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+/* NxS[  19] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 22, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 22, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 22, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 22, 14, 14, 14, 
           14, 14, 14, 14, 14}),
+/* NxS[  20] */ new Table(0, 0, -1, null),
+/* NxS[  21] */ new Table(0, 0, -1, null),
 /* NxS[  22] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 23, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 23, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 23, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 23, 
           14, 14, 14, 14, 14}),
 /* NxS[  23] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 24, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 24, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  24] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
@@ -244,9 +244,9 @@ struct Table {
           14, 14, 14, 14, 14}),
 /* NxS[  25] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 26, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 26, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  26] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
@@ -255,96 +255,192 @@ struct Table {
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 27, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  27] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 28, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 28, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 28, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 28, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  28] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 29, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 29, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  29] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 30, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 30, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 30, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 30, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  30] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 31, 14, 14, 
+          14, 14, 14, 31, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 31, 14, 14, 
+          14, 14, 14, 31, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  31] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 32, 14, 
+          14, 14, 14, 14, 14, 14, 32, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 32, 14, 
+          14, 14, 14, 14, 14, 14, 32, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  32] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 33, 14, 14, 
+          14, 14, 14, 33, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 33, 14, 14, 
+          14, 14, 14, 33, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
 /* NxS[  33] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 34, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 34, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  34] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 35, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 35, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  35] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 36, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 36, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  36] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 37, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 37, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  37] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 38, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 38, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  38] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 39, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 39, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  39] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 40, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 40, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  40] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
-/* NxS[  34] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 35, 14, 
+/* NxS[  41] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 42, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 42, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  42] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 43, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 43, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  43] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 44, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 35, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 44, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
-/* NxS[  35] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+/* NxS[  44] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
           14, 14, 14, 14, 14}),
-/* NxS[  36] */ new Table(0, 0, -1, null),
-/* NxS[  37] */ new Table(0, 0, -1, null),
-/* NxS[  38] */ new Table(0, 0, -1, null),
-/* NxS[  39] */ new Table(0, 0, -1, null),
-/* NxS[  40] */ new Table(0, 0, -1, null),
-/* NxS[  41] */ new Table(39, 1, 41, new sbyte[] {-1}),
-/* NxS[  42] */ new Table(39, 1, 41, new sbyte[] {-1}),
-/* NxS[  43] */ new Table(39, 64, 41, new sbyte[] {-1, 41, 41, 41, 41, 41, 
-          41, 41, 41, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 41, 41, 41, 
-          41, 41, 41, 41, 48, 48, 48, 48, 48, 48, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 48, 48, 48, 48, 48, 48}),
-/* NxS[  44] */ new Table(0, 0, -1, null),
-/* NxS[  45] */ new Table(39, 1, 46, new sbyte[] {47}),
-/* NxS[  46] */ new Table(39, 1, 41, new sbyte[] {-1}),
-/* NxS[  47] */ new Table(0, 0, -1, null),
-/* NxS[  48] */ new Table(39, 64, 41, new sbyte[] {-1, 41, 41, 41, 41, 41, 
-          41, 41, 41, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 41, 41, 41, 
-          41, 41, 41, 41, 49, 49, 49, 49, 49, 49, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 49, 49, 49, 49, 49, 49}),
-/* NxS[  49] */ new Table(39, 1, 41, new sbyte[] {-1}),
-/* NxS[  50] */ new Table(33, 90, -1, new sbyte[] {1, -1, -1, 2, 3, -1, 
+/* NxS[  45] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 46, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 46, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  46] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 47, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 47, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  47] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 48, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 48, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  48] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 49, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 49, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  49] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  50] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 51, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 51, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  51] */ new Table(48, 75, -1, new sbyte[] {14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, -1, -1, -1, -1, -1, -1, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, -1, -1, -1, -1, 14, -1, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
+          14, 14, 14, 14, 14}),
+/* NxS[  52] */ new Table(0, 0, -1, null),
+/* NxS[  53] */ new Table(0, 0, -1, null),
+/* NxS[  54] */ new Table(0, 0, -1, null),
+/* NxS[  55] */ new Table(0, 0, -1, null),
+/* NxS[  56] */ new Table(0, 0, -1, null),
+/* NxS[  57] */ new Table(39, 1, 57, new sbyte[] {-1}),
+/* NxS[  58] */ new Table(39, 1, 57, new sbyte[] {-1}),
+/* NxS[  59] */ new Table(39, 64, 57, new sbyte[] {-1, 57, 57, 57, 57, 57, 
+          57, 57, 57, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 57, 57, 57, 
+          57, 57, 57, 57, 64, 64, 64, 64, 64, 64, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 64, 64, 64, 64, 64, 64}),
+/* NxS[  60] */ new Table(0, 0, -1, null),
+/* NxS[  61] */ new Table(39, 1, 62, new sbyte[] {63}),
+/* NxS[  62] */ new Table(39, 1, 57, new sbyte[] {-1}),
+/* NxS[  63] */ new Table(0, 0, -1, null),
+/* NxS[  64] */ new Table(39, 64, 57, new sbyte[] {-1, 57, 57, 57, 57, 57, 
+          57, 57, 57, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 57, 57, 57, 
+          57, 57, 57, 57, 65, 65, 65, 65, 65, 65, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 65, 65, 65, 65, 65, 65}),
+/* NxS[  65] */ new Table(39, 1, 57, new sbyte[] {-1}),
+/* NxS[  66] */ new Table(33, 90, -1, new sbyte[] {1, -1, -1, 2, 3, -1, 
           4, 5, 6, -1, -1, 7, -1, 8, -1, 9, 9, 9, 9, 9, 9, 9, 
-          9, 9, 9, 51, -1, 10, 52, 11, -1, 12, 13, 14, 14, 14, 15, 16, 
-          14, 14, 14, 14, 14, 14, 14, 14, 17, 14, 14, 14, 14, 18, 14, 14, 
-          14, 14, 14, 14, 19, -1, 20, -1, 14, -1, 13, 14, 14, 14, 15, 16, 
-          14, 14, 14, 14, 14, 14, 14, 14, 17, 14, 14, 14, 14, 18, 14, 14, 
+          9, 9, 9, 67, -1, 10, 68, 11, -1, 12, 13, 14, 14, 14, 15, 16, 
+          14, 17, 14, 14, 14, 14, 14, 14, 18, 14, 14, 14, 14, 19, 14, 14, 
+          14, 14, 14, 14, 20, -1, 21, -1, 14, -1, 13, 14, 14, 14, 15, 16, 
+          14, 17, 14, 14, 14, 14, 14, 14, 18, 14, 14, 14, 14, 19, 14, 14, 
           14, 14, 14, 14}),
-/* NxS[  51] */ new Table(58, 1, -1, new sbyte[] {39}),
-/* NxS[  52] */ new Table(61, 1, -1, new sbyte[] {37}),
-/* NxS[  53] */ new Table(10, 83, 41, new sbyte[] {42, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 43, 41, 44, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 
-          41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 45}),
+/* NxS[  67] */ new Table(58, 1, -1, new sbyte[] {55}),
+/* NxS[  68] */ new Table(61, 1, -1, new sbyte[] {53}),
+/* NxS[  69] */ new Table(10, 83, 57, new sbyte[] {58, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 59, 57, 60, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 
+          57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 61}),
     };
 
 int NextState() {
@@ -814,66 +910,84 @@ public int yyleng
         case 16:
         case 17:
         case 18:
-        case 21:
+        case 19:
         case 22:
-        case 25:
+        case 23:
         case 26:
         case 27:
+        case 28:
         case 29:
         case 30:
         case 31:
         case 32:
+        case 33:
         case 34:
+        case 35:
+        case 36:
+        case 37:
+        case 38:
+        case 39:
+        case 41:
+        case 42:
+        case 43:
+        case 45:
+        case 46:
+        case 47:
+        case 48:
+        case 50:
 yylval.strval = yytext; return (int)Tokens.LABEL;
             break;
-        case 19:
+        case 20:
 return (int)Tokens.LBRACK;
             break;
-        case 20:
+        case 21:
 return (int)Tokens.RBRACK;
             break;
-        case 23:
+        case 24:
 yylval.intval = 1; return (int)Tokens.INT;
             break;
-        case 24:
+        case 25:
 return (int)Tokens.LOR;
             break;
-        case 28:
+        case 40:
+return (int)Tokens.HASTRAILINGSLASH;
+            break;
+        case 44:
 yylval.intval = 0; return (int)Tokens.INT;
             break;
-        case 33:
+        case 49:
 return (int)Tokens.EXISTS;
             break;
-        case 35:
+        case 51:
 return (int)Tokens.LAND;
             break;
-        case 36:
+        case 52:
 return (int)Tokens.GEQUAL;
             break;
-        case 37:
+        case 53:
 return (int)Tokens.EQUALS;
             break;
-        case 38:
+        case 54:
 return (int)Tokens.LEQUAL;
             break;
-        case 39:
+        case 55:
 return (int)Tokens.DCOLON;
             break;
-        case 40:
+        case 56:
 return (int)Tokens.NOTEQUAL;
             break;
-        case 41:
-        case 43:
-        case 45:
-        case 48:
+        case 57:
+        case 59:
+        case 61:
+        case 64:
 sb.Append(yytext);
             break;
-        case 42:
+        case 58:
 /* error - unterminated string constant */
         /* generate error message */
 		throw new Exception("Unterminated string constant: " + sb.ToString());
             break;
-        case 44:
+        case 60:
 /* saw closing quote - all done */
         BEGIN(INITIAL);
         /* return string constant token type and
@@ -882,11 +996,11 @@ public int yyleng
 		yylval.strval = sb.ToString();
 		return (int)Tokens.STRING;
             break;
-        case 46:
-        case 47:
+        case 62:
+        case 63:
 sb.Append(yytext[1]);
             break;
-        case 49:
+        case 65:
 /* escape sequence */
 		sb.Append((char)Convert.ToInt32(yytext.Substring(1, 2), 16));
             break;
diff --git a/typroject/typ.lex b/typroject/typ.lex
index 60d38eab..d42f92ad 100644
--- a/typroject/typ.lex
+++ b/typroject/typ.lex
@@ -27,6 +27,7 @@
 [tT][rR][uU][eE]		yylval.intval = 1; return (int)Tokens.INT;
 [fF][aA][lL][sS][eE]		yylval.intval = 0; return (int)Tokens.INT;
 [eE][xX][iI][sS][tT][sS]		return (int)Tokens.EXISTS;
+[hH][aA][sS][tT][rR][aA][iI][lL][iI][nN][gG][sS][lL][aA][sS][hH]		return (int)Tokens.HASTRAILINGSLASH;
 "$"			return (int)Tokens.DOLLARS;
 "@"			return (int)Tokens.AT;
 "%"			return (int)Tokens.PERCENT;
diff --git a/typroject/typ.y b/typroject/typ.y
index 93f913f2..a414b0d9 100644
--- a/typroject/typ.y
+++ b/typroject/typ.y
@@ -4,7 +4,7 @@
 %start expression
 %partial
 
-%token	EQUALS COLON MUL LPAREN RPAREN AMP PLUS MINUS DOLLARS COMMA NEWLINE FUNC ASSIGN NOT NOTEQUAL LEQUAL GEQUAL LBRACE RBRACE AT PERCENT EXISTS
+%token	EQUALS COLON MUL LPAREN RPAREN AMP PLUS MINUS DOLLARS COMMA NEWLINE FUNC ASSIGN NOT NOTEQUAL LEQUAL GEQUAL LBRACE RBRACE AT PERCENT EXISTS HASTRAILINGSLASH
 %token	LBRACK RBRACK DOT LT GT LSHIFT RSHIFT SEMICOLON LOR LAND OR AND APPEND ASSIGNIF DCOLON
 %token	IF ELSE INCLUDE RULEFOR INPUTS DEPENDS ALWAYS SHELLCMD TYPROJECT SOURCES MKDIR FUNCTION RETURN EXPORT
 %token	INTEGER STRING VOID ARRAY OBJECT FUNCREF ANY NULL
@@ -65,6 +65,7 @@ expr11		:	STRING							{ $$ = new StringExpression { val = $1 }; }
 			|	AT LPAREN LABEL RPAREN			{ $$ = new ListExpression { val = new LabelExpression { val = $3 } }; }
 			|	PERCENT LPAREN LABEL RPAREN		{ $$ = new MetadataExpression { val = new LabelExpression { val = $3 } }; }
 			|	EXISTS LPAREN expr RPAREN		{ $$ = new ExistsExpression { val = $3 }; }
+			|	HASTRAILINGSLASH LPAREN expr RPAREN	{ $$ = new HasTrailingSlashExpression { val = $3 }; }
 			;
 
 propexpr		:	LABEL							{ $$ = new LabelExpression { val = $1 }; }
diff --git a/typroject/typp.cs b/typroject/typp.cs
index bec38759..8aa4d17a 100644
--- a/typroject/typp.cs
+++ b/typroject/typp.cs
@@ -4,9 +4,9 @@
 
 // GPPG version 1.5.2
 // Machine:  DESKTOP-JOHN
-// DateTime: 30/10/2017 11:40:16
+// DateTime: 30/10/2017 19:28:36
 // UserName: jncro
-// Input file <typ.y - 30/10/2017 11:40:14>
+// Input file <typ.y - 30/10/2017 19:28:33>
 
 // options: conflicts lines gplex conflicts
 
@@ -23,14 +23,14 @@ internal enum Tokens {error=2,EOF=3,EQUALS=4,COLON=5,MUL=6,
     LPAREN=7,RPAREN=8,AMP=9,PLUS=10,MINUS=11,DOLLARS=12,
     COMMA=13,NEWLINE=14,FUNC=15,ASSIGN=16,NOT=17,NOTEQUAL=18,
     LEQUAL=19,GEQUAL=20,LBRACE=21,RBRACE=22,AT=23,PERCENT=24,
-    EXISTS=25,LBRACK=26,RBRACK=27,DOT=28,LT=29,GT=30,
-    LSHIFT=31,RSHIFT=32,SEMICOLON=33,LOR=34,LAND=35,OR=36,
-    AND=37,APPEND=38,ASSIGNIF=39,DCOLON=40,IF=41,ELSE=42,
-    INCLUDE=43,RULEFOR=44,INPUTS=45,DEPENDS=46,ALWAYS=47,SHELLCMD=48,
-    TYPROJECT=49,SOURCES=50,MKDIR=51,FUNCTION=52,RETURN=53,EXPORT=54,
-    INTEGER=55,STRING=56,VOID=57,ARRAY=58,OBJECT=59,FUNCREF=60,
-    ANY=61,NULL=62,FOR=63,FOREACH=64,IN=65,WHILE=66,
-    DO=67,INT=68,LABEL=69};
+    EXISTS=25,HASTRAILINGSLASH=26,LBRACK=27,RBRACK=28,DOT=29,LT=30,
+    GT=31,LSHIFT=32,RSHIFT=33,SEMICOLON=34,LOR=35,LAND=36,
+    OR=37,AND=38,APPEND=39,ASSIGNIF=40,DCOLON=41,IF=42,
+    ELSE=43,INCLUDE=44,RULEFOR=45,INPUTS=46,DEPENDS=47,ALWAYS=48,
+    SHELLCMD=49,TYPROJECT=50,SOURCES=51,MKDIR=52,FUNCTION=53,RETURN=54,
+    EXPORT=55,INTEGER=56,STRING=57,VOID=58,ARRAY=59,OBJECT=60,
+    FUNCREF=61,ANY=62,NULL=63,FOR=64,FOREACH=65,IN=66,
+    WHILE=67,DO=68,INT=69,LABEL=70};
 
 internal partial struct ValueType
 #line 16 "typ.y"
@@ -66,115 +66,120 @@ internal partial class Parser: ShiftReduceParser<ValueType, LexLocation>
 #pragma warning disable 649
   private static Dictionary<int, string> aliases;
 #pragma warning restore 649
-  private static Rule[] rules = new Rule[34];
-  private static State[] states = new State[66];
+  private static Rule[] rules = new Rule[35];
+  private static State[] states = new State[70];
   private static string[] nonTerms = new string[] {
       "expression", "expr", "expr2", "expr3", "expr6", "expr7", "expr10", "expr11", 
       "propexpr", "arglist", "dottedlabel", "$accept", };
 
   static Parser() {
-    states[0] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-1,1,-2,3,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[0] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-1,1,-2,3,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
     states[1] = new State(new int[]{3,2});
     states[2] = new State(-1);
     states[3] = new State(-2);
     states[4] = new State(-3);
-    states[5] = new State(new int[]{34,6,3,-5,8,-5,13,-5});
-    states[6] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-3,7,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[5] = new State(new int[]{35,6,3,-5,8,-5,13,-5});
+    states[6] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-3,7,-4,5,-5,8,-6,11,-7,14,-8,19});
     states[7] = new State(-4);
-    states[8] = new State(new int[]{35,9,34,-7,3,-7,8,-7,13,-7});
-    states[9] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-4,10,-5,8,-6,11,-7,14,-8,19});
+    states[8] = new State(new int[]{36,9,35,-7,3,-7,8,-7,13,-7});
+    states[9] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-4,10,-5,8,-6,11,-7,14,-8,19});
     states[10] = new State(-6);
-    states[11] = new State(new int[]{4,12,18,64,35,-10,34,-10,3,-10,8,-10,13,-10});
-    states[12] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-5,13,-6,11,-7,14,-8,19});
+    states[11] = new State(new int[]{4,12,18,68,36,-10,35,-10,3,-10,8,-10,13,-10});
+    states[12] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-5,13,-6,11,-7,14,-8,19});
     states[13] = new State(-8);
-    states[14] = new State(new int[]{29,15,30,58,19,60,20,62,4,-15,18,-15,35,-15,34,-15,3,-15,8,-15,13,-15});
-    states[15] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-6,16,-7,14,-8,19});
+    states[14] = new State(new int[]{30,15,31,62,19,64,20,66,4,-15,18,-15,36,-15,35,-15,3,-15,8,-15,13,-15});
+    states[15] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-6,16,-7,14,-8,19});
     states[16] = new State(-11);
-    states[17] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-7,18,-8,19});
+    states[17] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-7,18,-8,19});
     states[18] = new State(-16);
     states[19] = new State(-17);
     states[20] = new State(-18);
     states[21] = new State(-19);
-    states[22] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-2,23,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[22] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-2,23,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
     states[23] = new State(new int[]{8,24});
     states[24] = new State(-20);
     states[25] = new State(new int[]{7,26});
-    states[26] = new State(new int[]{69,31,26,50},new int[]{-9,27});
-    states[27] = new State(new int[]{8,28,28,29});
+    states[26] = new State(new int[]{70,31,27,54},new int[]{-9,27});
+    states[27] = new State(new int[]{8,28,29,29});
     states[28] = new State(-21);
-    states[29] = new State(new int[]{69,31,26,50},new int[]{-9,30});
-    states[30] = new State(-27);
-    states[31] = new State(new int[]{7,32,8,-25,28,-25});
-    states[32] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45,8,-31,13,-31},new int[]{-10,33,-2,49,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[29] = new State(new int[]{70,31,27,54},new int[]{-9,30});
+    states[30] = new State(-28);
+    states[31] = new State(new int[]{7,32,8,-26,29,-26});
+    states[32] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49,8,-32,13,-32},new int[]{-10,33,-2,53,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
     states[33] = new State(new int[]{8,34,13,35});
-    states[34] = new State(-26);
-    states[35] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-2,36,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
-    states[36] = new State(-30);
+    states[34] = new State(-27);
+    states[35] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-2,36,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[36] = new State(-31);
     states[37] = new State(new int[]{7,38});
-    states[38] = new State(new int[]{69,39});
+    states[38] = new State(new int[]{70,39});
     states[39] = new State(new int[]{8,40});
     states[40] = new State(-22);
     states[41] = new State(new int[]{7,42});
-    states[42] = new State(new int[]{69,43});
+    states[42] = new State(new int[]{70,43});
     states[43] = new State(new int[]{8,44});
     states[44] = new State(-23);
     states[45] = new State(new int[]{7,46});
-    states[46] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-2,47,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[46] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-2,47,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
     states[47] = new State(new int[]{8,48});
     states[48] = new State(-24);
-    states[49] = new State(-29);
-    states[50] = new State(new int[]{69,57},new int[]{-11,51});
-    states[51] = new State(new int[]{27,52,28,55});
-    states[52] = new State(new int[]{40,53});
-    states[53] = new State(new int[]{69,31,26,50},new int[]{-9,54});
-    states[54] = new State(-28);
-    states[55] = new State(new int[]{69,56});
-    states[56] = new State(-33);
-    states[57] = new State(-32);
-    states[58] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-6,59,-7,14,-8,19});
-    states[59] = new State(-12);
-    states[60] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-6,61,-7,14,-8,19});
-    states[61] = new State(-13);
-    states[62] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-6,63,-7,14,-8,19});
-    states[63] = new State(-14);
-    states[64] = new State(new int[]{17,17,56,20,68,21,7,22,12,25,23,37,24,41,25,45},new int[]{-5,65,-6,11,-7,14,-8,19});
-    states[65] = new State(-9);
+    states[49] = new State(new int[]{7,50});
+    states[50] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-2,51,-3,4,-4,5,-5,8,-6,11,-7,14,-8,19});
+    states[51] = new State(new int[]{8,52});
+    states[52] = new State(-25);
+    states[53] = new State(-30);
+    states[54] = new State(new int[]{70,61},new int[]{-11,55});
+    states[55] = new State(new int[]{28,56,29,59});
+    states[56] = new State(new int[]{41,57});
+    states[57] = new State(new int[]{70,31,27,54},new int[]{-9,58});
+    states[58] = new State(-29);
+    states[59] = new State(new int[]{70,60});
+    states[60] = new State(-34);
+    states[61] = new State(-33);
+    states[62] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-6,63,-7,14,-8,19});
+    states[63] = new State(-12);
+    states[64] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-6,65,-7,14,-8,19});
+    states[65] = new State(-13);
+    states[66] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-6,67,-7,14,-8,19});
+    states[67] = new State(-14);
+    states[68] = new State(new int[]{17,17,57,20,69,21,7,22,12,25,23,37,24,41,25,45,26,49},new int[]{-5,69,-6,11,-7,14,-8,19});
+    states[69] = new State(-9);
 
     for (int sNo = 0; sNo < states.Length; sNo++) states[sNo].number = sNo;
 
     rules[1] = new Rule(-12, new int[]{-1,3});
     rules[2] = new Rule(-1, new int[]{-2});
     rules[3] = new Rule(-2, new int[]{-3});
-    rules[4] = new Rule(-3, new int[]{-4,34,-3});
+    rules[4] = new Rule(-3, new int[]{-4,35,-3});
     rules[5] = new Rule(-3, new int[]{-4});
-    rules[6] = new Rule(-4, new int[]{-5,35,-4});
+    rules[6] = new Rule(-4, new int[]{-5,36,-4});
     rules[7] = new Rule(-4, new int[]{-5});
     rules[8] = new Rule(-5, new int[]{-6,4,-5});
     rules[9] = new Rule(-5, new int[]{-6,18,-5});
     rules[10] = new Rule(-5, new int[]{-6});
-    rules[11] = new Rule(-6, new int[]{-7,29,-6});
-    rules[12] = new Rule(-6, new int[]{-7,30,-6});
+    rules[11] = new Rule(-6, new int[]{-7,30,-6});
+    rules[12] = new Rule(-6, new int[]{-7,31,-6});
     rules[13] = new Rule(-6, new int[]{-7,19,-6});
     rules[14] = new Rule(-6, new int[]{-7,20,-6});
     rules[15] = new Rule(-6, new int[]{-7});
     rules[16] = new Rule(-7, new int[]{17,-7});
     rules[17] = new Rule(-7, new int[]{-8});
-    rules[18] = new Rule(-8, new int[]{56});
-    rules[19] = new Rule(-8, new int[]{68});
+    rules[18] = new Rule(-8, new int[]{57});
+    rules[19] = new Rule(-8, new int[]{69});
     rules[20] = new Rule(-8, new int[]{7,-2,8});
     rules[21] = new Rule(-8, new int[]{12,7,-9,8});
-    rules[22] = new Rule(-8, new int[]{23,7,69,8});
-    rules[23] = new Rule(-8, new int[]{24,7,69,8});
+    rules[22] = new Rule(-8, new int[]{23,7,70,8});
+    rules[23] = new Rule(-8, new int[]{24,7,70,8});
     rules[24] = new Rule(-8, new int[]{25,7,-2,8});
-    rules[25] = new Rule(-9, new int[]{69});
-    rules[26] = new Rule(-9, new int[]{69,7,-10,8});
-    rules[27] = new Rule(-9, new int[]{-9,28,-9});
-    rules[28] = new Rule(-9, new int[]{26,-11,27,40,-9});
-    rules[29] = new Rule(-10, new int[]{-2});
-    rules[30] = new Rule(-10, new int[]{-10,13,-2});
-    rules[31] = new Rule(-10, new int[]{});
-    rules[32] = new Rule(-11, new int[]{69});
-    rules[33] = new Rule(-11, new int[]{-11,28,69});
+    rules[25] = new Rule(-8, new int[]{26,7,-2,8});
+    rules[26] = new Rule(-9, new int[]{70});
+    rules[27] = new Rule(-9, new int[]{70,7,-10,8});
+    rules[28] = new Rule(-9, new int[]{-9,29,-9});
+    rules[29] = new Rule(-9, new int[]{27,-11,28,41,-9});
+    rules[30] = new Rule(-10, new int[]{-2});
+    rules[31] = new Rule(-10, new int[]{-10,13,-2});
+    rules[32] = new Rule(-10, new int[]{});
+    rules[33] = new Rule(-11, new int[]{70});
+    rules[34] = new Rule(-11, new int[]{-11,29,70});
   }
 
   protected override void Initialize() {
@@ -304,48 +309,53 @@ protected override void DoAction(int action)
                                 { CurrentSemanticValue.exprval = new ExistsExpression { val = ValueStack[ValueStack.Depth-2].exprval }; }
 #line default
         break;
-      case 25: // propexpr -> LABEL
-#line 70 "typ.y"
-                        { CurrentSemanticValue.exprval = new LabelExpression { val = ValueStack[ValueStack.Depth-1].strval }; }
+      case 25: // expr11 -> HASTRAILINGSLASH, LPAREN, expr, RPAREN
+#line 68 "typ.y"
+                                         { CurrentSemanticValue.exprval = new HasTrailingSlashExpression { val = ValueStack[ValueStack.Depth-2].exprval }; }
 #line default
         break;
-      case 26: // propexpr -> LABEL, LPAREN, arglist, RPAREN
+      case 26: // propexpr -> LABEL
 #line 71 "typ.y"
-                                  { CurrentSemanticValue.exprval = new LabelExpression { val = ValueStack[ValueStack.Depth-4].strval, arglist = ValueStack[ValueStack.Depth-2].listval }; }
+                        { CurrentSemanticValue.exprval = new LabelExpression { val = ValueStack[ValueStack.Depth-1].strval }; }
 #line default
         break;
-      case 27: // propexpr -> propexpr, DOT, propexpr
+      case 27: // propexpr -> LABEL, LPAREN, arglist, RPAREN
 #line 72 "typ.y"
-                             { CurrentSemanticValue.exprval = new LabelDotExpression { val = ValueStack[ValueStack.Depth-1].exprval, srcval = ValueStack[ValueStack.Depth-3].exprval }; }
+                                  { CurrentSemanticValue.exprval = new LabelExpression { val = ValueStack[ValueStack.Depth-4].strval, arglist = ValueStack[ValueStack.Depth-2].listval }; }
 #line default
         break;
-      case 28: // propexpr -> LBRACK, dottedlabel, RBRACK, DCOLON, propexpr
+      case 28: // propexpr -> propexpr, DOT, propexpr
 #line 73 "typ.y"
+                             { CurrentSemanticValue.exprval = new LabelDotExpression { val = ValueStack[ValueStack.Depth-1].exprval, srcval = ValueStack[ValueStack.Depth-3].exprval }; }
+#line default
+        break;
+      case 29: // propexpr -> LBRACK, dottedlabel, RBRACK, DCOLON, propexpr
+#line 74 "typ.y"
                                                { CurrentSemanticValue.exprval = new StaticExpression { type = ValueStack[ValueStack.Depth-4].strval, val = ValueStack[ValueStack.Depth-1].exprval }; }
 #line default
         break;
-      case 29: // arglist -> expr
-#line 76 "typ.y"
+      case 30: // arglist -> expr
+#line 77 "typ.y"
                        { CurrentSemanticValue.listval = new List<Expression> { ValueStack[ValueStack.Depth-1].exprval }; }
 #line default
         break;
-      case 30: // arglist -> arglist, COMMA, expr
-#line 77 "typ.y"
+      case 31: // arglist -> arglist, COMMA, expr
+#line 78 "typ.y"
                            { CurrentSemanticValue.listval = new List<Expression>(ValueStack[ValueStack.Depth-3].listval); CurrentSemanticValue.listval.Add(ValueStack[ValueStack.Depth-1].exprval); }
 #line default
         break;
-      case 31: // arglist -> /* empty */
-#line 78 "typ.y"
+      case 32: // arglist -> /* empty */
+#line 79 "typ.y"
              { CurrentSemanticValue.listval = new List<Expression>(); }
 #line default
         break;
-      case 32: // dottedlabel -> LABEL
-#line 81 "typ.y"
+      case 33: // dottedlabel -> LABEL
+#line 82 "typ.y"
                           { CurrentSemanticValue.strval = ValueStack[ValueStack.Depth-1].strval; }
 #line default
         break;
-      case 33: // dottedlabel -> dottedlabel, DOT, LABEL
-#line 82 "typ.y"
+      case 34: // dottedlabel -> dottedlabel, DOT, LABEL
+#line 83 "typ.y"
                              { CurrentSemanticValue.strval = ValueStack[ValueStack.Depth-3].strval + "." + ValueStack[ValueStack.Depth-1].strval; }
 #line default
         break;
@@ -363,7 +373,7 @@ protected override string TerminalToString(int terminal)
         return CharToString((char)terminal);
   }
 
-#line 86 "typ.y"
+#line 87 "typ.y"
 
 #line default
 }
diff --git a/typroject/typroject.csproj.user b/typroject/typroject.csproj.user
index 4daf87d6..5ec472f4 100644
--- a/typroject/typroject.csproj.user
+++ b/typroject/typroject.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartWorkingDirectory>D:\tysos\coreclr\src\mscorlib\</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\tysos\corefx\src\System.Private.Uri\src</StartWorkingDirectory>
     <StartArguments>
     </StartArguments>
   </PropertyGroup>
diff --git a/tysila4/COutput.cs b/tysila4/COutput.cs
index f0e125ad..9a4150a2 100644
--- a/tysila4/COutput.cs
+++ b/tysila4/COutput.cs
@@ -25,7 +25,7 @@
 using System.IO;
 using System.Text;
 using libtysila5.target;
-
+using binary_library.binary;
 
 namespace tysila4
 {
@@ -35,23 +35,24 @@ class COutput
             string output_cinit)
         {
             FileStream fs = new FileStream(output_header, FileMode.Create, FileAccess.Write);
-            StreamWriter sw = new StreamWriter(fs);
+            var sw = fs;
 
-            StreamWriter hmsw = new StreamWriter(new MemoryStream());
-            StreamWriter cmsw = new StreamWriter(new MemoryStream());
+            var hmsw = new MemoryStream();
+            var cmsw = new MemoryStream();
 
-            StreamWriter oci = null;
+            FileStream oci = null;
             System.IO.FileInfo header_fi = new FileInfo(output_header);
             if (output_cinit != null)
             {
-                oci = new StreamWriter(new FileStream(output_cinit, FileMode.Create, FileAccess.Write));
-                oci.WriteLine("#include \"" + header_fi.Name + "\"");
-                oci.WriteLine("#include <string.h>");
-                oci.WriteLine("#include <stdlib.h>");
-                oci.WriteLine("#include <stdint.h>");
-                oci.WriteLine();
-                oci.WriteLine("INTPTR Get_Symbol_Addr(const char *name);");
-                oci.WriteLine();
+                oci = new FileStream(output_cinit, FileMode.Create, FileAccess.Write);
+
+                HexFile.writeStr(oci, "#include \"" + header_fi.Name + "\"", true);
+                HexFile.writeStr(oci, "#include <string.h>", true);
+                HexFile.writeStr(oci, "#include <stdlib.h>", true);
+                HexFile.writeStr(oci, "#include <stdint.h>", true);
+                HexFile.writeStr(oci, "", true);
+                HexFile.writeStr(oci, "INTPTR Get_Symbol_Addr(const char *name);", true);
+                HexFile.writeStr(oci, "", true);
             }
 
             List<string> advance_defines = new List<string>();
@@ -92,35 +93,36 @@ class COutput
                 }
             }
 
-            sw.WriteLine("#include <stdint.h>");
-            sw.WriteLine();
-            sw.WriteLine("#ifdef INTPTR");
-            sw.WriteLine("#undef INTPTR");
-            sw.WriteLine("#endif");
-            sw.WriteLine("#ifdef UINTPTR");
-            sw.WriteLine("#undef UINTPTR");
-            sw.WriteLine("#endif");
-            sw.WriteLine();
-            sw.WriteLine("#define INTPTR " + ((ass.GetPointerSize() == 4) ? ass.GetCType(m.SystemInt32) : ass.GetCType(m.SystemInt64)));
-            sw.WriteLine("#define UINTPTR " + ((ass.GetPointerSize() == 4) ? ass.GetCType(m.GetSimpleTypeSpec(0x09)) : ass.GetCType(m.GetSimpleTypeSpec(0x0b))));
-            sw.WriteLine();
+            HexFile.writeStr(sw, "");
+            HexFile.writeStr(sw, "#include <stdint.h>");
+            HexFile.writeStr(sw, "");
+            HexFile.writeStr(sw, "#ifdef INTPTR");
+            HexFile.writeStr(sw, "#undef INTPTR");
+            HexFile.writeStr(sw, "#endif");
+            HexFile.writeStr(sw, "#ifdef UINTPTR");
+            HexFile.writeStr(sw, "#undef UINTPTR");
+            HexFile.writeStr(sw, "#endif");
+            HexFile.writeStr(sw, "");
+            HexFile.writeStr(sw, "#define INTPTR " + ((ass.GetPointerSize() == 4) ? ass.GetCType(m.SystemInt32) : ass.GetCType(m.SystemInt64)));
+            HexFile.writeStr(sw, "#define UINTPTR " + ((ass.GetPointerSize() == 4) ? ass.GetCType(m.GetSimpleTypeSpec(0x09)) : ass.GetCType(m.GetSimpleTypeSpec(0x0b))));
+            HexFile.writeStr(sw, "");
             EmitArrayType(sw, ass, m);
             foreach (string s in advance_defines)
-                sw.WriteLine(s);
-            sw.WriteLine();
+                HexFile.writeStr(sw, s);
+            HexFile.writeStr(sw, "");
             if (oci != null)
             {
                 foreach (string s2 in func_headers)
-                    sw.WriteLine(s2);
-                sw.WriteLine();
+                    HexFile.writeStr(sw, s2);
+                HexFile.writeStr(sw, "");
             }
             hmsw.Flush();
-            StreamReader hmsr = new StreamReader(hmsw.BaseStream);
+            StreamReader hmsr = new StreamReader(hmsw);
             hmsr.BaseStream.Seek(0, SeekOrigin.Begin);
             string hs = hmsr.ReadLine();
             while (hs != null)
             {
-                sw.WriteLine(hs);
+                HexFile.writeStr(sw, hs);
                 hs = hmsr.ReadLine();
             }
 
@@ -129,23 +131,23 @@ class COutput
             if (oci != null)
             {
                 foreach (string s in external_defines)
-                    oci.WriteLine(s);
-                oci.WriteLine();
+                    HexFile.writeStr(sw, s);
+                HexFile.writeStr(sw, "");
 
                 cmsw.Flush();
-                StreamReader cmsr = new StreamReader(cmsw.BaseStream);
+                StreamReader cmsr = new StreamReader(cmsw);
                 cmsr.BaseStream.Seek(0, SeekOrigin.Begin);
                 string cs = cmsr.ReadLine();
                 while (cs != null)
                 {
-                    oci.WriteLine(cs);
+                    HexFile.writeStr(sw, cs);
                     cs = cmsr.ReadLine();
                 }
                 oci.Close();
             }
         }
 
-        private static void EmitType(TypeSpec tdr, StreamWriter hmsw, StreamWriter cmsw,
+        private static void EmitType(TypeSpec tdr, Stream hmsw, Stream cmsw,
             List<string> advance_defines, List<string> external_defines, List<string> header_funcs, Target ass)
         {
             //Layout l = Layout.GetTypeInfoLayout(new Assembler.TypeToCompile { _ass = ass, tsig = new Signature.Param(tdr, ass), type = tdr }, ass, false);
@@ -162,7 +164,7 @@ class COutput
 
             if (!tdr.IsEnum)
             {
-                hmsw.WriteLine("struct " + tns + "_" + tname + " {");
+                HexFile.writeStr(hmsw, "struct " + tns + "_" + tname + " {");
                 advance_defines.Add("struct " + tns + "_" + tname + ";");
 
                 List<TypeSpec> fields = new List<TypeSpec>();
@@ -173,39 +175,39 @@ class COutput
                 for (int i = 0; i < fields.Count; i++)
                 {
                     int bytesize;
-                    hmsw.WriteLine("    " + ass.GetCType(fields[i], out bytesize) + " " + fnames[i] + ";");
+                    HexFile.writeStr(hmsw, "    " + ass.GetCType(fields[i], out bytesize) + " " + fnames[i] + ";");
 
                     // Pad out to align size
                     bytesize = align - bytesize;
                     while ((bytesize % 2) != 0)
                     {
-                        hmsw.WriteLine("    uint8_t __reserved" + (next_rsvd++).ToString() + ";");
+                        HexFile.writeStr(hmsw, "    uint8_t __reserved" + (next_rsvd++).ToString() + ";");
                         bytesize--;
                     }
                     while ((bytesize % 4) != 0)
                     {
-                        hmsw.WriteLine("    uint16_t __reserved" + (next_rsvd++).ToString() + ";");
+                        HexFile.writeStr(hmsw, "    uint16_t __reserved" + (next_rsvd++).ToString() + ";");
                         bytesize -= 2;
                     }
                     while(bytesize != 0)
                     {
-                        hmsw.WriteLine("    uint32_t __reserved" + (next_rsvd++).ToString() + ";");
+                        HexFile.writeStr(hmsw, "    uint32_t __reserved" + (next_rsvd++).ToString() + ";");
                         bytesize -= 4;
                     }
                 }
 
 
                 //if (packed_structs)
-                //    hmsw.WriteLine("} __attribute__((__packed__));");
+                //    HexFile.writeStr(hmsw, "} __attribute__((__packed__));");
                 //else
-                    hmsw.WriteLine("};");
+                HexFile.writeStr(hmsw, "};");
             }
             else
             {
                 // Identify underlying type
                 var utype = tdr.UnderlyingType;
                 bool needs_comma = false;
-                hmsw.WriteLine("enum " + tns + "_" + tname + " {");
+                HexFile.writeStr(hmsw, "enum " + tns + "_" + tname + " {");
 
                 var first_fdef = tdr.m.GetIntEntry(MetadataStream.tid_TypeDef,
                     tdr.tdrow, 4);
@@ -238,18 +240,18 @@ class COutput
                                     (int)fdef_row, 1);
 
                                 if (needs_comma)
-                                    hmsw.WriteLine(",");
-                                hmsw.Write("    " + fname + " = " + v.ToString());
+                                    HexFile.writeStr(hmsw, ",");
+                                HexFile.writeStr(hmsw, "    " + fname + " = " + v.ToString(), true);
                                 needs_comma = true;
                             }
                         }
                     }
                 }
-                hmsw.WriteLine();
-                hmsw.WriteLine("};");
+                HexFile.writeStr(hmsw);
+                HexFile.writeStr(hmsw, "};");
             }
 
-            hmsw.WriteLine();
+            HexFile.writeStr(hmsw);
 
             //if (output_cinit != null)
             //{
@@ -257,15 +259,15 @@ class COutput
                 {
                     string init_func = "void Init_" + tns + "_" + tname + "(struct " +
                         tns + "_" + tname + " *obj)";
-                    cmsw.WriteLine(init_func);
+                    HexFile.writeStr(cmsw, init_func);
                     header_funcs.Add(init_func + ";");
-                    cmsw.WriteLine("{");
+                    HexFile.writeStr(cmsw, "{");
 
-                    cmsw.WriteLine("    obj->__vtbl = Get_Symbol_Addr(\"" + tdr.MangleType() + "\");");
-                    cmsw.WriteLine("    obj->__mutex_lock = 0;");
+                    HexFile.writeStr(cmsw, "    obj->__vtbl = Get_Symbol_Addr(\"" + tdr.MangleType() + "\");");
+                    HexFile.writeStr(cmsw, "    obj->__mutex_lock = 0;");
 
-                    cmsw.WriteLine("}");
-                    cmsw.WriteLine();
+                    HexFile.writeStr(cmsw, "}");
+                    HexFile.writeStr(cmsw);
 
                     if(tdr.Equals(tdr.m.SystemString))
                         EmitStringInit(tdr, hmsw, cmsw, advance_defines, external_defines, header_funcs, ass);
@@ -273,7 +275,7 @@ class COutput
             //}
         }
 
-        private static void EmitArrayInit(StreamWriter hmsw, StreamWriter cmsw, List<string> header_funcs,
+        private static void EmitArrayInit(Stream hmsw, Stream cmsw, List<string> header_funcs,
             Target ass, MetadataStream m)
         {
             EmitArrayInit(m.SystemObject, "Ref", hmsw, cmsw, header_funcs, ass);
@@ -290,26 +292,26 @@ class COutput
             EmitArrayInit(m.GetSimpleTypeSpec(0x0b), "U8", hmsw, cmsw, header_funcs, ass);
         }
 
-        private static void EmitArrayType(StreamWriter hmsw, Target ass, MetadataStream m)
+        private static void EmitArrayType(Stream hmsw, Target ass, MetadataStream m)
         {
-            hmsw.WriteLine("struct __array");
-            hmsw.WriteLine("{");
-            hmsw.WriteLine("    INTPTR           __vtbl;");
-            hmsw.WriteLine("    int64_t          __mutex_lock;");
-            hmsw.WriteLine("    INTPTR           elemtype;");
-            hmsw.WriteLine("    INTPTR           lobounds;");
-            hmsw.WriteLine("    INTPTR           sizes;");
-            hmsw.WriteLine("    INTPTR           inner_array;");
-            hmsw.WriteLine("    INTPTR           rank;");
-            hmsw.WriteLine("    int32_t          elem_size;");
+            HexFile.writeStr(hmsw, "struct __array");
+            HexFile.writeStr(hmsw, "{");
+            HexFile.writeStr(hmsw, "    INTPTR           __vtbl;");
+            HexFile.writeStr(hmsw, "    int64_t          __mutex_lock;");
+            HexFile.writeStr(hmsw, "    INTPTR           elemtype;");
+            HexFile.writeStr(hmsw, "    INTPTR           lobounds;");
+            HexFile.writeStr(hmsw, "    INTPTR           sizes;");
+            HexFile.writeStr(hmsw, "    INTPTR           inner_array;");
+            HexFile.writeStr(hmsw, "    INTPTR           rank;");
+            HexFile.writeStr(hmsw, "    int32_t          elem_size;");
             //if (packed_structs)
-            //    hmsw.WriteLine("} __attribute__((__packed__));");
+            //    HexFile.writeStr(hmsw, "} __attribute__((__packed__));");
             //else
-                hmsw.WriteLine("};");
-            hmsw.WriteLine();
+            HexFile.writeStr(hmsw, "};");
+            HexFile.writeStr(hmsw);
         }
 
-        private static void EmitArrayInit(TypeSpec ts, string tname, StreamWriter hmsw, StreamWriter cmsw,
+        private static void EmitArrayInit(TypeSpec ts, string tname, Stream hmsw, Stream cmsw,
             List<string> header_funcs, Target ass)
         {
             string typestr = ass.GetCType(ts);
@@ -348,25 +350,25 @@ private static void EmitArrayType(StreamWriter hmsw, Target ass, MetadataStream
             //int elem_size = ass.GetPackedSizeOf(new Signature.Param(baseType_Type));
 
             header_funcs.Add(init_func_name + ";");
-            cmsw.WriteLine(init_func_name);
-            cmsw.WriteLine("{");
-            cmsw.WriteLine("    *arr_obj = (struct __array *)malloc(sizeof(struct __array));");
-            cmsw.WriteLine("    (*arr_obj)->__vtbl = Get_Symbol_Addr(\"" + ts.SzArray.MangleType() + "\");");
-            cmsw.WriteLine("    (*arr_obj)->__mutex_lock = 0;");
-            cmsw.WriteLine("    (*arr_obj)->rank = 1;");
-            cmsw.WriteLine("    (*arr_obj)->elem_size = sizeof(" + typestr + ");");
-            cmsw.WriteLine("    (*arr_obj)->elemtype = Get_Symbol_Addr(\"" + ts.MangleType() + "\");");
-            cmsw.WriteLine("    (*arr_obj)->lobounds = (INTPTR)(intptr_t)malloc(sizeof(int32_t));");
-            cmsw.WriteLine("    (*arr_obj)->sizes = (INTPTR)(intptr_t)malloc(sizeof(int32_t));");
-            cmsw.WriteLine("    (*arr_obj)->inner_array = (INTPTR)(intptr_t)malloc(length * sizeof(int32_t));");
-            cmsw.WriteLine("    *(int32_t *)(intptr_t)((*arr_obj)->lobounds) = 0;");
-            cmsw.WriteLine("    *(int32_t *)(intptr_t)((*arr_obj)->sizes) = length;");
-            cmsw.WriteLine("    return((void *)(intptr_t)((*arr_obj)->inner_array));");
-            cmsw.WriteLine("}");
-            cmsw.WriteLine();
+            HexFile.writeStr(cmsw, init_func_name);
+            HexFile.writeStr(cmsw, "{");
+            HexFile.writeStr(cmsw, "    *arr_obj = (struct __array *)malloc(sizeof(struct __array));");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->__vtbl = Get_Symbol_Addr(\"" + ts.SzArray.MangleType() + "\");");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->__mutex_lock = 0;");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->rank = 1;");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->elem_size = sizeof(" + typestr + ");");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->elemtype = Get_Symbol_Addr(\"" + ts.MangleType() + "\");");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->lobounds = (INTPTR)(intptr_t)malloc(sizeof(int32_t));");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->sizes = (INTPTR)(intptr_t)malloc(sizeof(int32_t));");
+            HexFile.writeStr(cmsw, "    (*arr_obj)->inner_array = (INTPTR)(intptr_t)malloc(length * sizeof(int32_t));");
+            HexFile.writeStr(cmsw, "    *(int32_t *)(intptr_t)((*arr_obj)->lobounds) = 0;");
+            HexFile.writeStr(cmsw, "    *(int32_t *)(intptr_t)((*arr_obj)->sizes) = length;");
+            HexFile.writeStr(cmsw, "    return((void *)(intptr_t)((*arr_obj)->inner_array));");
+            HexFile.writeStr(cmsw, "}");
+            HexFile.writeStr(cmsw);
         }
 
-        private static void EmitStringInit(TypeSpec tdr, StreamWriter hmsw, StreamWriter cmsw,
+        private static void EmitStringInit(TypeSpec tdr, Stream hmsw, Stream cmsw,
             List<string> advance_defines, List<string> external_defines, List<string> header_funcs, Target ass)
         {
             // Emit a string creation instruction of the form:
@@ -375,22 +377,22 @@ private static void EmitArrayType(StreamWriter hmsw, Target ass, MetadataStream
             string init_func = "void CreateString(struct System_String **obj, const char *s)";
             header_funcs.Add(init_func + ";");
 
-            cmsw.WriteLine(init_func);
-            cmsw.WriteLine("{");
-            cmsw.WriteLine("    int l = strlen(s);");
-            cmsw.WriteLine("    int i;");
-            cmsw.WriteLine("    " + ass.GetCType(tdr.m.SystemChar) + " *p;");
-            cmsw.WriteLine("    *obj = (struct System_String *)malloc(sizeof(struct System_String) + l * sizeof(" +
+            HexFile.writeStr(cmsw, init_func);
+            HexFile.writeStr(cmsw, "{");
+            HexFile.writeStr(cmsw, "    int l = strlen(s);");
+            HexFile.writeStr(cmsw, "    int i;");
+            HexFile.writeStr(cmsw, "    " + ass.GetCType(tdr.m.SystemChar) + " *p;");
+            HexFile.writeStr(cmsw, "    *obj = (struct System_String *)malloc(sizeof(struct System_String) + l * sizeof(" +
                 ass.GetCType(tdr.m.SystemChar) + "));");
-            cmsw.WriteLine("    Init_System_String(*obj);");
-            cmsw.WriteLine("    (*obj)->length = l;");
-            cmsw.WriteLine("    p = &((*obj)->start_char);");
-            //cmsw.WriteLine("    p = (" + ass.GetCType(BaseType_Type.Char) +
+            HexFile.writeStr(cmsw, "    Init_System_String(*obj);");
+            HexFile.writeStr(cmsw, "    (*obj)->length = l;");
+            HexFile.writeStr(cmsw, "    p = &((*obj)->start_char);");
+            //HexFile.writeStr(cmsw, "    p = (" + ass.GetCType(BaseType_Type.Char) +
             //    " *)(*obj + sizeof(struct System_String));");
-            cmsw.WriteLine("    for(i = 0; i < l; i++)");
-            cmsw.WriteLine("        p[i] = (" + ass.GetCType(tdr.m.SystemChar) + ")s[i];");
-            cmsw.WriteLine("}");
-            cmsw.WriteLine();
+            HexFile.writeStr(cmsw, "    for(i = 0; i < l; i++)");
+            HexFile.writeStr(cmsw, "        p[i] = (" + ass.GetCType(tdr.m.SystemChar) + ")s[i];");
+            HexFile.writeStr(cmsw, "}");
+            HexFile.writeStr(cmsw);
         }
     }
 }
diff --git a/tysila4/tysila4.csproj b/tysila4/tysila4.csproj
index b53580f3..03aa40c0 100644
--- a/tysila4/tysila4.csproj
+++ b/tysila4/tysila4.csproj
@@ -84,14 +84,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="COutput.cs" />
     <Compile Include="FileSystemFileLoader.cs" />
diff --git a/tysos/tysos.csproj b/tysos/tysos.csproj
index e6399bf8..1acbe335 100644
--- a/tysos/tysos.csproj
+++ b/tysos/tysos.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>tysos</RootNamespace>
     <AssemblyName>tysos</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -28,6 +28,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,6 +38,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Generate tloadkif|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -48,6 +50,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile corlib|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +61,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile TestProcess|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -67,6 +71,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile libtysila|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -78,6 +83,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile libsupcs|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -89,6 +95,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Compile BareBones|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -99,6 +106,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -204,9 +212,6 @@
       <Name>metadata</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="x86_64\switcher.asm" />
   </ItemGroup>
diff --git a/unicode_support/char-conversions/char-conversions.csproj b/unicode_support/char-conversions/char-conversions.csproj
index 86b0695f..b084e4c8 100644
--- a/unicode_support/char-conversions/char-conversions.csproj
+++ b/unicode_support/char-conversions/char-conversions.csproj
@@ -31,15 +31,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="create-category-table.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />