diff --git a/CS2JLibrary/NetFramework/System/Array'1.xml b/CS2JLibrary/NetFramework/System/Array'1.xml
index 5f9d7ff..c407717 100644
--- a/CS2JLibrary/NetFramework/System/Array'1.xml
+++ b/CS2JLibrary/NetFramework/System/Array'1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -81,4 +81,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>pAt0jheU4oI5ezmpm8Ylz3fXR6w=</DigestValue></Reference></SignedInfo><SignatureValue>HimhDfzlqsUBQ16LnfozuW9G/gtzg45vzr6UtdHdyy9dQtX6vYRnHc1UtqRfYQT73uJ/jGV2IIWYvpR4m4O62Sl/meRcCH+0mQoepAC/o6+EQgKcJjDr8XhNDppUMayfl4GL9Gfg/yq8/21jnPqEQ/r5y6pAhlOsrbsCp2fVVOQ=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>4tVOJbuP1pVke4TtnQZVaouGbx0=</DigestValue></Reference></SignedInfo><SignatureValue>IoUhzxP/j0CrwueOE6tQAtfxoKXoyCBkos7axq4itnvWX4jZr6VzlO37NIPoDcbzIkOXClg/nfS6q8TuIFGw/gYwHafjI/OBYSpCZwlfXLMmc+HCzxMnWWue0a7IOXNzTbeWrbd7gy4Qp0zv8Wr45NlgdWJpGVTQaXWbAiO5jmw=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
index 26a70ab..63575d7 100644
--- a/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/ArrayList.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/IComparer'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/IComparer'1.xml
index 59a2d2d..8748d18 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/IComparer'1.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/IComparer'1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -33,4 +33,4 @@
   </Methods>
   <Properties>
   </Properties>
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>FzD0ISaWZKb/GDgZSI4werJrHHs=</DigestValue></Reference></SignedInfo><SignatureValue>NeU9k5KOXySVLGMadMEZfh5bsC928iltYWSnpm/5N0sN3NSyfZYUPZ3mL8DG8bZPzJbTIla2fkkZH0FbsDbtU1AeTYpFg9C8NSGDeYqR1mNEaCqYUZQmmP5MP9TtyT9dZOItpb4TXSWjKdkahUaw6CbFRn38Az9Wfh+8DdHIzjg=</SignatureValue></Signature></Interface>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>/PjF1YTT9YA7Mx/RRyWYrceaKa0=</DigestValue></Reference></SignedInfo><SignatureValue>axDWxokriznrp2wjipORfzl9sGm+cQ8TDNWUXEU1IdY1uVCkjb9eSKpItf/HOEftNpt3HVmaXN9jQGXSGid0LPNeKSgRa1MvjvgW3ook98V1IH9jgZGRRMsgzJZ+1C+1wpHd9XRqmiOVD2eFgmsynaGyJwwsAL1hX7DP6rY/ps8=</SignatureValue></Signature></Interface>
diff --git a/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml b/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
index 950ac6b..8b9f858 100644
--- a/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
+++ b/CS2JLibrary/NetFramework/System/Collections/Generic/List'1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -208,4 +208,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>rUong3D9EauJhCA+cIiWlGuXn08=</DigestValue></Reference></SignedInfo><SignatureValue>esb0vH9iEN6TefBNnLiampoglnuOe2oggi0NVh+r9eoUKf6vzAQCfNGubdlKaf8IausdKZ3wS212MtQtXkJ8TFKPjK+gOpmoVhFKd/6rPnT5xt89+N7s5cByTPW8epjPNnAH7pEiRbzk5+JpH/xKeNCCoGoADV4L/E0TIsZRCH4=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>dMxWahle6+JWazXF5rdEoxNFqHQ=</DigestValue></Reference></SignedInfo><SignatureValue>QHAtm2BA/7k2dSASQHMw6aKKJEGk6P2x5HAGuae81wbbLDkrnihhH2PFU+6WFudzrinE4JSp9WOHKzOxJ659kj6Wg8qx5asDxOhkhG06He0TE4jcq64/U0tM2GZxViqhaFHAExXAZoT9rxjqP5prxerSnSvfy16hhPAixY5XEEA=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/Enum.xml b/CS2JLibrary/NetFramework/System/Enum.xml
index e076e55..14d3680 100644
--- a/CS2JLibrary/NetFramework/System/Enum.xml
+++ b/CS2JLibrary/NetFramework/System/Enum.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -96,4 +96,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>IJMEeLm8aEBz8xz+22PUOm4mKmY=</DigestValue></Reference></SignedInfo><SignatureValue>GBzy7yxUC2deFlJLdqC849pFbVEg5Zv+sB5LLtV4mnAixFeiQ5PlOHal7FqDSoqMtMpjMYpc9rjRvkWrQSWWWMJ5IAOI4HZBcTy1CYAWXnBXMjoUscMdyFIgzQF7ExrANCDt0LUn7xWCAb2S57bcj7yIREPjDonAM6YPOWi9Xa4=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>421taeYQfl8V0tcircAA5cgNF0k=</DigestValue></Reference></SignedInfo><SignatureValue>PyqeBNqGPZ4PQJx5QA+x2S2m8q7O1RZHsx2u2rJUhyoZbLrF+NBIfomV7dbIgIJ9Q5tjQTEyOKPRVve5SmgJ97w3bKOkyUgZbGk69vSMsBbtUk8IgtsYCfcBG9UmvjCBh9pV5bReRf8iJAvnLQpC9n9GRomXGV+K7DMzPrFwz0E=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/EnumAsNumber.xml b/CS2JLibrary/NetFramework/System/EnumAsNumber.xml
index 27f48e6..a1b7734 100644
--- a/CS2JLibrary/NetFramework/System/EnumAsNumber.xml
+++ b/CS2JLibrary/NetFramework/System/EnumAsNumber.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -95,4 +95,4 @@
   </Casts>
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>IJMEeLm8aEBz8xz+22PUOm4mKmY=</DigestValue></Reference></SignedInfo><SignatureValue>GBzy7yxUC2deFlJLdqC849pFbVEg5Zv+sB5LLtV4mnAixFeiQ5PlOHal7FqDSoqMtMpjMYpc9rjRvkWrQSWWWMJ5IAOI4HZBcTy1CYAWXnBXMjoUscMdyFIgzQF7ExrANCDt0LUn7xWCAb2S57bcj7yIREPjDonAM6YPOWi9Xa4=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>4k0U7tevFUQGN33Tfaobpi/xr64=</DigestValue></Reference></SignedInfo><SignatureValue>DPkWTs8CFtDAbj2n+7s8QOnQyELUqZGzUoo/MPJ/VJozmcYviAip5P2q1FIzeZiNgLmvihJlz2MM+frdFAXuoUYvTqhbOq5jgPSsCkZymbvNyVR260JixNfSEIxunzyREvMPS0N0Lvmi7znH2IXxfUgXJpOw1El5qzfng49LTp8=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/EventHandler.xml b/CS2JLibrary/NetFramework/System/EventHandler.xml
index c54411b..ec07250 100644
--- a/CS2JLibrary/NetFramework/System/EventHandler.xml
+++ b/CS2JLibrary/NetFramework/System/EventHandler.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -79,5 +79,5 @@
     <TypeParams />
     <Return>void</Return>
   </Invoke>
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>10gQjwZURfUiWRQQZHHLhjzvyao=</DigestValue></Reference></SignedInfo><SignatureValue>LqaNkGhL5G8I7kNkIqKGWaU1y3aQS1NNeLnUK0bAhiQDk2aatsldV3RvSyA+sUyHJ/La+jYz5chPUmZusenax1EoM9CvvOoP9Uzpz4V4VtpWWBJr65Hc9rLhyfkgxoGgSnuvFOxxLVd/t1LqzE+SHlfgaxYTttwwIoSqHksEsAc=</SignatureValue></Signature>
-</Delegate>
+
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>yz+yOlqpwafASqBPdP2mB/lVgZk=</DigestValue></Reference></SignedInfo><SignatureValue>Nv+agoqBJd5WaI7/+c3HuvQ/dt5/5j3fHCKxNm4v8TZITAC8J+AbF8DN3l3ZZC1+zmhBzRTyrMMD7EWi7zumiRrhC2r/+rUpYbfOeiHANORPmwqP5NvSBeUbWvEp3VRBtQZHYNTDNG1gbOApoTGZi0z3dSv1ySftgALkYlxmbrc=</SignatureValue></Signature></Delegate>
diff --git a/CS2JLibrary/NetFramework/System/Guid.xml b/CS2JLibrary/NetFramework/System/Guid.xml
index fcd4e76..81aaefb 100644
--- a/CS2JLibrary/NetFramework/System/Guid.xml
+++ b/CS2JLibrary/NetFramework/System/Guid.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -65,4 +65,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>BWTUYjLWt9lhNcsisL7KPlMEpMA=</DigestValue></Reference></SignedInfo><SignatureValue>DEwlw/C876DDTf6CQdhYOCRAm40EZ3UibuZLz4igngKTcY4fuLbZYgzNVg+HDvx3Td0s2Fb+NE56jDRuvxFV5JtlH5zChw8wWIhIXpBEXy1cHtRP1Gzs9UyohW4qbhjg9EdKgYw+YKMAno5ekJzduVK1+GKR9ZJSNn6p5BOdfS4=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>Tp6afT/OOq5ZjPtIh+5sx/AznjE=</DigestValue></Reference></SignedInfo><SignatureValue>SBAuNXFb2mDvbwarVc1cEamAfpEcSFiCdg7vRdFqHdPZkX0l52vLAHkQue0//Lrhi0hS+H/cKH7yL/+nmb8riN0bCBNlvGv4WKd0cR3+xzMyM64uD1qK8cHaSbezuBnrg3Op57fY+8C7g7ZrKP+/NSBbTihZupD86KgHYt/UdFA=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/Int32.xml b/CS2JLibrary/NetFramework/System/Int32.xml
index b295b16..4adad4e 100644
--- a/CS2JLibrary/NetFramework/System/Int32.xml
+++ b/CS2JLibrary/NetFramework/System/Int32.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -97,4 +97,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>ee4shtgByHk+rz7iW0IrblSu/tU=</DigestValue></Reference></SignedInfo><SignatureValue>DyYu37ip7PQxgZEpLh8C+4JCDSXSCyR5QqnzAUn2385Dt2u3Njc2v+2DJISKPJpWVJFVK9TYnVK8u4/oFy1kE7o1eQUKfT45942M8rdgOmvzY/He7q0ywYfP2OOn5KcErn3CkW1R4lJr9WJNfc8yCAB/hMoATnwF8/cn+f4RCHo=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>U7pwY3jlpV92Mj9uCvADW7uPaS8=</DigestValue></Reference></SignedInfo><SignatureValue>R2oeJFhJ4hTwbI1qNZBUbVnUAgynOWNZbslF4qrBDrmLCW5V7/C3j+/wl686Y976A5jAEuU24PDPN8EpW7hJlkrl/H0qTr2WauKrOzYvUQbmoDFvb5iDOFiACl+zPr7kU8iVL9owVYn6GGowQsRI/tz7+cbWAx0sokREdqyPMsg=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/Number.xml b/CS2JLibrary/NetFramework/System/Number.xml
index b8c47e6..cb6dd19 100644
--- a/CS2JLibrary/NetFramework/System/Number.xml
+++ b/CS2JLibrary/NetFramework/System/Number.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -45,7 +45,7 @@
       <Return>System.String</Return>
     </Method>
     <Method>
-      <Java>${value} == ${this} ? 0 : (${value} > ${this} ? 1 : -1)</Java>
+      <Java>${value} == ${this} ? 0 : (${value} &gt; ${this} ? 1 : -1)</Java>
       <Params>
         <Param>
           <Type>System.Number</Type>
@@ -64,4 +64,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>ow4cnbEdJB7wZYzfDALOMAacPzQ=</DigestValue></Reference></SignedInfo><SignatureValue>hJswDqg+FvuxTzQknsrNzWt1P4vTWAznJ1tCC7AQnxqrt469K7nlm5RDI/ossxlOBPkKtVqvQjm93aPkcYBeqjBQ7opkU3MIEJqDcssrthLk5uPfpB2nRIxQDxBECfn4PO7pg4QltMrOZU3GUi5mtPg1qq+2ephVomMEfr72pEk=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>baj5Z8pab7ivOkC9NG4mn0p5jnE=</DigestValue></Reference></SignedInfo><SignatureValue>hnQnxLR8Eg1eBhdKqjbTeSR6C5nyrdEx3rWJj3ymJ/uiD4hx58ZQAxA7yBMXW9Bs3l55lfZ1rlChWadSSncr430x0qA4MMRVFIklb9DA9cnDbi37XIV+8eAgkcE/0xKBJAAGNA5YC2OVVYC2pZURDpzHgbOCfs1ZqulFxzDxxEY=</SignatureValue></Signature></Class>
diff --git a/CS2JLibrary/NetFramework/System/String.xml b/CS2JLibrary/NetFramework/System/String.xml
index 65954b8..98c58c7 100644
--- a/CS2JLibrary/NetFramework/System/String.xml
+++ b/CS2JLibrary/NetFramework/System/String.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -838,4 +838,4 @@
   <Casts />
   <UnaryOps />
   <BinaryOps />
-<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>pKuM7rzzFKiMdIFjHEmp6PR43Rs=</DigestValue></Reference></SignedInfo><SignatureValue>aSAEt0GEmmvS5GjqbY4kNJHsEeEA15XacdDFHPUrLMoVmtJzMCnkxjhD7y9Nu3frpRuoiehZH48mYdW6lBihJEjH1oihcpbYg7+bu6STlZTtSxEjQFaV15J9exRgyG5nQgg8VNpLFdJ4iid5XZoNZG+enppt6kIwNH4+ZF0GJag=</SignatureValue></Signature></Class>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>BUx2RTxYMQVeapKp047S1CT8sUE=</DigestValue></Reference></SignedInfo><SignatureValue>cZ+d2G4D36AoaLt+GWMNJv2FURspfOXVBO20eWT8/okEKLf3N9+urHTNMqxXNcA2PF9k0DEdZc49/jv6VrbaWhvR9idLlroC9pxn/rI4/F87UGt343ArW6Ocz4QoJqiDBhCAnMmp1pvc3cbEsIrBNM1yz1rD54WsSy+mE+NGRdU=</SignatureValue></Signature></Class>
diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
index 38e453d..7a21bfa 100644
--- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
+++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.IO;
 using System.Xml;
 using Antlr.Runtime.Tree;
@@ -31,7 +32,7 @@ namespace Twiglet.CS2J.Translator
 {
     class CS2J
     {
-       private const string VERSION = "2011.1.1";
+       private const string VERSION = "2011.2.2";
        private static DirectoryHT<TypeRepTemplate> AppEnv { get; set; }
        private static CS2JSettings cfg = new CS2JSettings();
        private static StringTemplateGroup templates = null;
@@ -369,7 +370,7 @@ namespace Twiglet.CS2J.Translator
                 // Verify the signature of the signed XML.
                 if (!VerifyXml(xmlDoc, RsaKey))
                 {
-		           Console.Out.WriteLine("Bad / Missing signature found for " + fullName);
+                   Console.Out.WriteLine("WARNING: Bad / Missing signature found for " + fullName);
                    badXmlTxCount--;
                    if (badXmlTxCount <= 0)
                    {
@@ -418,19 +419,17 @@ namespace Twiglet.CS2J.Translator
             cfg.DebugLevel = saveDebugLevel;
         }
 		
-		private static string limit(string inp) {
-			if (numLines > numLines - 1)
-			    return inp;
-                        // TRIAL ONLY
-			String[] lines = inp.Split(newLines, numLines+1, StringSplitOptions.None);
-			if (lines.Length <= numLines) {
-				return inp;
-			}
-		    String[] res = new String[numLines+1];
-			Array.Copy(lines, res, numLines);
-			res[numLines] = "";
-			return String.Join(Environment.NewLine, res);
-		}
+       private static string limit(string inp) {
+          if (numLines > numLines - 1)
+             return inp;
+          // TRIAL ONLY
+          String[] lines = inp.Split(newLines, numLines+1, StringSplitOptions.None);
+          if (lines.Length <= numLines) {
+             return inp;
+          }
+          lines[numLines] = Regex.Replace(lines[numLines], "\\w", "x");^M
+          return String.Join(Environment.NewLine, lines);^M
+       }
 
         // Here's where we do the real work...		
         public static void translateFile(string fullName)
diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
index 2fdba2c..78bd6d5 100644
--- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
+++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
@@ -15,14 +15,9 @@ namespace Twiglet.CS2J.Translator
 group JavaPrettyPrintTemplates;
 
 itsmine(now, includeDate) ::= <<
-//
-//
-// This file was translated from C# to Java by CS2J (http://www.cs2j.com).
-//
-// For more information about CS2J please contact info@twigletsoftware.com
 <if(includeDate)>
 //
-// Translated: <now><\n>
+// Translated by CS2J (http://www.cs2j.com): <now><\n>
 <endif>
 //