diff --git a/CS2JLibrary/NetFramework/System/Console.xml b/CS2JLibrary/NetFramework/System/Console.xml
index fa94ea2..1c854aa 100644
--- a/CS2JLibrary/NetFramework/System/Console.xml
+++ b/CS2JLibrary/NetFramework/System/Console.xml
@@ -84,14 +84,10 @@
   </Methods>
   <Properties>
     <Property>
-      <Imports>
-        <Import>java.io.PrintWriter</Import>
-      </Imports>
-      <Java>new PrintWriter(System.out)</Java>
+      <Java>System.out</Java>
       <Type>System.IO.TextWriter</Type>
       <Name>Out</Name>
-      <Get>new PrintWriter(System.out)</Get>
-      <Set>${this:16}.setOut(${value})</Set>
+      <Get>System.out</Get>
     </Property>
   </Properties>
   <Events />
diff --git a/CS2JLibrary/NetFramework/System/IO/File.xml b/CS2JLibrary/NetFramework/System/IO/File.xml
index 8902c2a..2b9aefe 100644
--- a/CS2JLibrary/NetFramework/System/IO/File.xml
+++ b/CS2JLibrary/NetFramework/System/IO/File.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -18,12 +18,12 @@
   <Methods>
     <Method>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.OutputStreamWriter</Import>
         <Import>java.io.FileOutputStream</Import>
         <Import>java.nio.charset.Charset</Import>
       </Imports>
-      <Java>new BufferedWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
+      <Java>new PrintWriter(new OutputStreamWriter(new FileOutputStream(${path}), Charset.forName("UTF-8")))</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
diff --git a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
index 152b7db..69ecd38 100644
--- a/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/StreamWriter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,9 +9,9 @@
 -->
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
   <Imports>
-    <Import>java.io.BufferedWriter</Import>
+    <Import>java.io.PrintWriter</Import>
   </Imports>
-  <Java>BufferedWriter</Java>
+  <Java>PrintWriter</Java>
   <Name>System.IO.StreamWriter</Name>
   <Uses />
   <Inherits>
@@ -24,10 +24,10 @@
   <Constructors>
     <Constructor>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.FileWriter</Import>
       </Imports>
-      <Java>new BufferedWriter(new FileWriter(${path}))</Java>
+      <Java>new PrintWriter(new FileWriter(${path}), true)</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
@@ -37,10 +37,10 @@
     </Constructor>
     <Constructor>
       <Imports>
-        <Import>java.io.BufferedWriter</Import>
+        <Import>java.io.PrintWriter</Import>
         <Import>java.io.FileWriter</Import>
       </Imports>
-      <Java>new BufferedWriter(new FileWriter(${path},${append}))</Java>
+      <Java>new PrintWriter(new FileWriter(${path},${append}),true)</Java>
       <Params>
         <Param>
           <Type>System.String</Type>
diff --git a/CS2JLibrary/NetFramework/System/IO/TextWriter.xml b/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
index 2365ce9..248787c 100644
--- a/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
+++ b/CS2JLibrary/NetFramework/System/IO/TextWriter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
     This file is
@@ -9,9 +9,9 @@
 -->
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
   <Imports>
-    <Import>java.io.Writer</Import>
+    <Import>java.io.PrintStream</Import>
   </Imports>
-  <Java>Writer</Java>
+  <Java>PrintStream</Java>
   <Name>System.IO.TextWriter</Name>
   <Uses />
   <Inherits>
@@ -27,7 +27,7 @@
     </Method>
     <Method>
       <Imports />
-      <Java>${this:16}.write(${arg} + System.getProperty("line.separator"))</Java>
+      <Java>${this:16}.println(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Object</Type>
@@ -39,7 +39,7 @@
     </Method>
     <Method>
       <Imports />
-      <Java>${this:16}.write(${arg})</Java>
+      <Java>${this:16}.print(${arg})</Java>
       <Params>
         <Param>
           <Type>System.Object</Type>