--- a/Stream.st	Mon Sep 19 08:39:59 2016 +0100
+++ b/Stream.st	Mon Sep 19 08:46:27 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -1987,11 +1985,11 @@
             i := i - 1
         ]
     ] ifFalse:[
-        1 to:vlen do:[:i |
-            self nextPutByte:(v digitAt:i).
+        1 to:vlen do:[:idx |
+            self nextPutByte:(v digitAt:idx).
         ].
         "pad with trailing zeros"
-        vlen+1 to:n do:[:i |
+        vlen+1 to:n do:[:idx |
             self nextPutByte:0.
         ].
     ].
@@ -2027,7 +2025,7 @@
 
     "
         (#[] writeStream
-            nextPutAllUtf16Bytes:'BÄxxx' MSB:true;
+            nextPutAllUtf16Bytes:'BÄxxx' MSB:true;
             nextPutUtf16:(Character codePoint:16r10CCCC) MSB:true;
             contents)
    "
@@ -2445,7 +2443,7 @@
     "
         ((WriteStream on:Unicode16String new)
             nextPutUtf16:$B;
-            nextPutUtf16:$Ä; 
+            nextPutUtf16:$Ä; 
             nextPutUtf16:(Character codePoint:16r10CCCC)
             yourself) contents
     "
@@ -2480,13 +2478,13 @@
     "
         (#[] writeStream
             nextPutUtf16:$B MSB:true;
-            nextPutUtf16:$Ä MSB:true;
+            nextPutUtf16:$Ä MSB:true;
             nextPutUtf16:(Character codePoint:16r10CCCC) MSB:true;
             contents)
 
         (FileStream newTemporary
             nextPutUtf16:$B MSB:false;
-            nextPutUtf16:$Ä MSB:false;
+            nextPutUtf16:$Ä MSB:false;
             nextPutUtf16:(Character codePoint:16r10CCCC) MSB:false;
             reset;
             binary;
@@ -2551,7 +2549,7 @@
     "
       (String streamContents:[:s|
             s nextPutUtf8:$a.
-            s nextPutUtf8:$ü.
+            s nextPutUtf8:$ü.
             s nextPutUtf8: (Character value:16r1fff).
             s nextPutUtf8: (Character value:16rffff).
             s nextPutUtf8: (Character value:16r1ffffff).