diff --git a/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tpp b/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tpp
index d6a2e0373..14d6587cc 100644
--- a/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tpp
+++ b/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tpp
@@ -23,7 +23,7 @@ topic "";
 [s4;%- &]
 [s5;:RasterEncoder`:`:SetLine`(RGBA`*`):%- [@(0.0.255) void]_[* SetLine]([_^RGBA^ RGBA]_`*[*@3 `_
 line])&]
-[s2;  [%-*@3 `_line].&]
+[s2; Sets the  [%-*@3 `_line].&]
 [s3; &]
 [ {{10000F(128)G(128)@1 [s0; [* Public Method List]]}}&]
 [s0; &]
@@ -40,7 +40,7 @@ ize]_[*@3 sz])_`=_[@3 0]&]
 [s4; &]
 [s5;:RasterEncoder`:`:WriteLineRaw`(const byte`*`):%- [@(0.0.255) virtual] 
 [@(0.0.255) void]_[* WriteLineRaw]([@(0.0.255) const]_[_^byte^ byte]_`*[*@3 data])_`=_[@3 0]&]
-[s2;  [%-*@3 data].&]
+[s2; Called to write a single scanline [%-*@3 data] to output.&]
 [s3; &]
 [s4; &]
 [s5;:RasterEncoder`:`:WriteLine`(`):%- [@(0.0.255) void]_[* WriteLine]()&]
diff --git a/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tppi b/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tppi
index 800dbe54c..93f62dc7c 100644
--- a/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tppi
+++ b/uppsrc/Draw/src.tpp/RasterEncoder$en-us.tppi
@@ -1,8 +1,8 @@
 TITLE("")
 COMPRESSED
-120,156,173,88,107,79,227,70,20,253,43,35,177,160,36,10,209,188,252,138,85,137,150,221,5,169,219,22,145,86,251,193,114,108,147,12,96,53,216,169,61,217,22,16,249,237,189,227,71,112,18,39,113,66,16,50,102,230,62,206,185,175,25,217,161,232,211,39,220,197,39,120,199,79,255,179,184,15,102,19,233,58,33,231,166,29,80,205,254,251,215,63,44,91,233,19,208,103,6,97,166,198,8,167,58,60,8,35,84,163,140,19,147,90,220,100,204,196,253,209,36,72,83,215,153,80,211,204,148,104,151,158,80,67,163,196,224,38,55,9,51,76,10,186,20,99,138,13,170,17,206,76,170,245,199,34,29,185,14,6,113,6,62,44,157,89,152,96,108,16,130,25,53,48,211,56,33,140,130,9,106,80,130,181,190,136,198,174,115,173,219,74,129,43,82,154,14,208,117,176,198,57,6,235,74,141,51,194,48,101,26,177,52,189,127,39,30,194,168,142,146,182,147,146,129,251,161,20,79,5,163,128,219,157,11,205,38,160,170,119,245,19,3,220,114,13,156,89,138,17,3,53,74,117,205,34,
-26,7,72,28,211,126,34,254,153,133,137,120,18,145,44,44,132,132,80,98,223,17,195,6,8,243,249,188,71,56,206,35,101,0,22,130,1,55,37,176,6,60,12,162,89,216,210,76,98,98,102,112,170,25,64,125,26,36,193,83,193,228,142,83,187,224,97,118,205,19,157,232,16,81,108,2,126,205,2,3,24,72,192,95,8,164,6,191,204,236,203,66,89,233,41,37,171,107,157,64,144,152,134,13,11,27,220,208,56,48,161,68,39,16,72,172,248,67,26,250,81,156,60,5,19,215,121,245,222,78,191,252,126,254,215,0,57,232,245,149,168,90,185,104,65,90,122,156,246,112,27,57,41,182,145,211,185,48,108,142,254,12,229,68,184,238,219,219,153,235,164,196,190,104,225,30,238,1,168,54,59,61,71,249,90,255,54,72,165,72,190,68,163,120,44,18,191,239,231,117,211,7,1,167,34,143,138,106,98,200,115,157,14,67,75,90,174,50,69,237,204,34,179,115,211,37,180,175,45,66,205,246,85,246,188,32,37,58,116,147,196,82,140,164,24,163,223,196,211,157,72,82,244,45,76,101,
-9,149,23,70,82,173,6,223,189,138,131,204,0,122,195,124,247,107,182,52,68,213,255,92,15,220,228,178,117,248,182,251,24,8,249,45,140,132,223,186,189,250,229,103,191,227,183,87,226,129,126,196,225,56,243,80,72,186,45,5,6,132,1,4,60,93,207,239,64,14,24,242,189,137,218,109,23,8,144,115,122,94,89,238,229,136,154,196,107,118,55,9,71,16,44,249,24,143,151,98,133,237,130,206,70,50,87,66,222,4,19,33,165,184,140,103,145,244,91,53,116,194,68,206,160,184,150,22,195,40,15,226,138,190,219,42,217,220,10,57,75,162,20,201,71,129,162,153,74,35,138,239,209,40,158,196,144,207,48,202,214,167,185,38,106,197,9,122,17,73,220,174,112,222,6,122,32,131,4,160,14,194,23,209,16,238,123,74,148,106,150,16,165,61,68,234,169,54,32,238,233,139,219,246,252,159,60,7,222,113,89,22,151,193,100,2,133,24,200,12,112,170,180,21,143,105,18,143,68,154,134,209,67,153,53,208,110,136,254,123,2,163,74,213,197,109,240,175,223,26,197,81,42,209,221,179,
-20,181,165,180,149,76,213,18,112,170,136,100,86,65,198,27,42,203,195,204,254,162,238,198,129,12,106,168,150,76,178,237,125,185,212,22,206,26,206,247,242,216,219,124,30,167,157,45,87,113,85,31,143,154,62,76,215,90,48,109,202,31,202,63,159,40,138,127,230,100,21,89,197,243,230,113,84,85,240,207,202,198,42,54,91,109,111,221,224,94,97,124,111,210,186,52,109,142,77,165,187,247,205,92,101,46,252,216,238,116,33,54,68,139,215,53,247,176,180,39,128,120,42,146,64,194,96,41,74,166,6,67,41,226,122,74,6,92,30,232,194,159,47,172,215,196,240,93,234,128,24,102,35,110,169,180,86,7,23,42,164,142,83,38,223,195,177,124,220,88,203,149,161,159,9,30,199,231,181,8,31,30,55,55,80,197,105,46,121,4,175,112,48,95,199,114,48,141,193,237,77,12,30,182,31,226,133,108,118,108,100,226,80,170,113,129,11,166,197,116,109,126,76,247,152,31,11,32,203,89,94,245,131,174,42,56,142,17,128,207,177,76,55,158,161,21,242,74,174,254,192,244,189,177,218,91,
-191,191,100,203,205,35,144,35,217,85,228,57,142,99,48,95,204,194,134,103,202,160,50,5,27,31,42,197,221,102,189,52,138,245,166,87,157,10,220,124,211,63,107,10,181,60,114,202,195,166,230,152,201,1,249,94,146,11,212,128,93,236,53,4,124,153,136,64,129,221,81,88,185,216,230,139,216,234,129,220,248,118,85,250,87,77,221,221,222,217,11,12,235,211,6,92,142,254,115,187,117,131,72,109,61,175,1,4,233,197,235,243,65,177,234,54,172,198,29,145,235,54,60,219,183,148,40,88,57,176,90,215,130,191,55,169,3,82,113,4,198,203,217,251,32,249,60,155,13,154,117,119,38,63,222,193,203,185,60,180,153,223,243,185,15,173,195,114,249,113,206,27,179,185,47,253,229,133,242,142,215,89,249,192,177,231,173,206,159,215,155,173,178,156,187,141,188,224,242,51,5,110,246,97,229,82,245,70,50,27,169,107,241,88,200,32,156,84,62,20,184,255,3,81,208,29,32,
+120,156,173,88,107,111,226,70,20,253,43,35,101,19,1,34,104,94,198,54,86,165,180,217,221,68,234,182,141,66,171,253,96,25,219,129,201,198,170,99,179,246,176,219,36,10,191,189,119,252,32,6,12,24,66,20,57,206,204,125,156,115,95,51,178,77,209,135,15,184,139,79,240,142,159,193,71,113,239,207,66,233,216,1,231,134,229,83,205,250,247,247,191,76,75,233,19,208,103,58,97,134,198,8,167,125,120,16,70,168,70,25,39,6,53,185,193,152,129,7,227,208,79,83,199,14,169,97,100,74,180,75,79,168,174,81,162,115,131,27,132,233,6,5,93,138,49,197,58,213,8,103,6,213,6,19,145,142,29,27,131,56,3,31,102,159,153,152,96,172,19,130,25,213,49,211,56,33,140,130,9,170,83,130,181,129,136,38,142,125,221,183,148,2,87,164,180,62,64,239,131,53,206,49,88,87,106,156,17,134,41,211,136,169,245,7,119,226,91,16,213,81,210,118,82,210,241,32,144,226,177,96,228,115,171,115,161,89,4,84,251,221,254,137,14,110,185,6,206,76,197,136,129,26,165,125,
+205,36,26,7,72,28,211,65,34,190,207,130,68,60,138,72,22,22,2,66,40,177,238,136,110,1,132,249,124,222,35,28,231,145,210,1,11,193,128,155,18,88,3,30,58,209,76,108,106,6,49,48,211,57,213,116,160,62,245,19,255,177,96,114,199,169,85,240,48,186,198,73,159,244,33,162,216,0,252,154,9,6,48,144,128,191,16,72,13,126,153,49,144,133,178,210,83,74,102,215,60,129,32,49,13,235,38,214,185,174,113,96,66,73,159,64,32,177,226,15,105,24,68,113,242,232,135,142,253,226,190,158,126,250,243,252,159,33,178,209,203,11,81,181,114,209,130,180,244,56,237,225,54,178,83,108,33,187,115,161,91,28,253,29,200,80,56,206,235,235,153,99,167,196,186,104,225,30,238,1,168,54,59,61,71,249,218,224,214,79,165,72,62,69,227,120,34,18,111,224,229,117,51,0,1,187,34,143,138,106,98,200,117,236,14,67,75,90,142,50,69,173,204,34,179,114,211,37,180,207,45,66,141,246,85,246,188,32,37,58,116,147,196,82,140,165,152,160,63,196,227,157,72,82,244,37,
+72,101,9,149,23,70,82,173,6,223,189,138,131,204,0,186,163,124,247,115,182,52,66,213,255,28,23,220,228,178,117,248,182,251,24,10,249,37,136,132,215,186,189,250,237,87,175,227,181,87,226,129,126,196,193,36,243,80,72,58,45,5,6,132,1,4,60,29,215,235,64,14,24,242,220,80,237,182,11,4,32,157,34,249,32,16,178,79,207,43,251,189,28,90,147,192,205,238,194,96,12,81,147,15,241,100,41,104,216,42,120,109,100,117,37,228,141,31,10,41,197,101,60,139,164,215,170,225,21,36,114,6,85,182,180,24,68,121,52,87,244,157,86,73,235,86,200,89,18,229,204,162,153,202,39,138,239,209,56,14,99,72,108,16,101,235,211,92,19,181,226,4,61,139,36,110,87,56,111,3,61,148,126,2,80,135,193,179,104,8,247,45,55,74,53,203,140,210,30,33,245,84,27,16,247,244,217,105,187,222,47,174,13,239,184,172,143,75,63,12,161,34,125,153,1,78,149,182,226,49,77,226,177,72,211,32,250,86,102,13,180,27,162,255,154,192,204,82,5,114,235,255,244,90,227,56,
+74,37,186,123,146,162,182,166,182,146,169,90,2,78,21,145,204,42,200,184,35,101,121,148,217,95,20,224,196,151,254,102,170,50,70,63,149,93,228,35,197,47,4,214,99,63,82,37,89,82,205,244,149,92,60,147,211,153,220,151,118,109,141,173,81,122,171,164,189,205,231,33,221,217,166,21,87,245,161,171,233,221,116,209,182,139,188,55,77,59,116,74,62,133,20,255,204,201,42,178,138,231,205,35,172,170,224,157,149,61,88,108,182,218,238,186,193,189,194,248,214,207,117,105,218,28,155,202,32,216,55,115,149,17,242,99,187,211,133,216,8,45,94,215,220,195,210,158,0,226,169,72,124,9,51,168,40,153,26,12,165,136,227,42,25,112,121,160,11,111,190,176,94,19,195,55,169,3,98,152,77,195,165,210,90,157,113,168,144,58,78,153,124,13,38,242,97,99,45,87,206,135,76,240,56,62,175,69,240,237,97,115,3,85,156,230,146,71,240,10,199,243,117,44,135,211,24,220,222,196,224,97,251,193,95,200,102,39,76,38,14,165,26,23,184,96,90,76,215,230,199,116,143,249,177,0,
+178,156,229,85,63,232,170,130,227,24,1,248,24,203,116,227,113,91,33,175,228,234,207,86,207,157,168,189,85,242,197,114,243,8,228,72,118,21,121,142,227,24,204,23,179,176,225,153,50,172,76,193,198,135,74,113,13,90,47,141,98,189,233,173,168,2,55,223,244,206,154,66,45,143,156,242,176,169,57,102,114,64,158,155,228,2,53,96,23,123,13,1,95,38,194,87,96,119,20,86,46,182,249,206,182,122,32,55,190,136,149,254,85,83,119,183,119,246,2,195,250,180,1,151,227,255,156,110,221,32,82,91,79,107,0,65,122,241,250,116,80,172,186,13,171,113,71,228,186,13,207,246,45,37,10,86,14,172,214,181,224,239,77,234,128,84,28,129,241,114,246,222,73,62,207,102,131,102,221,157,201,247,119,240,114,46,15,109,230,183,124,238,67,235,176,92,190,159,243,198,108,238,75,127,121,161,188,227,117,86,62,138,236,121,171,243,230,245,102,171,44,231,78,35,47,184,252,180,129,155,125,140,185,84,189,145,204,198,234,90,60,17,210,15,194,202,55,5,231,127,79,79,48,55,
 
diff --git a/uppsrc/Draw/src.tpp/all.i b/uppsrc/Draw/src.tpp/all.i
index f39158e99..0d6c8a3e4 100644
--- a/uppsrc/Draw/src.tpp/all.i
+++ b/uppsrc/Draw/src.tpp/all.i
@@ -1,17 +1,17 @@
-TOPIC("Rasters$en-us")
-#include "Rasters$en-us.tppi"
-END_TOPIC
-
-TOPIC("Raster$en-us")
-#include "Raster$en-us.tppi"
+TOPIC("PaintRect$en-us")
+#include "PaintRect$en-us.tppi"
 END_TOPIC
 
 TOPIC("FontTextUtils$en-us")
 #include "FontTextUtils$en-us.tppi"
 END_TOPIC
 
-TOPIC("PaintRect$en-us")
-#include "PaintRect$en-us.tppi"
+TOPIC("Raster$en-us")
+#include "Raster$en-us.tppi"
+END_TOPIC
+
+TOPIC("Rasters$en-us")
+#include "Rasters$en-us.tppi"
 END_TOPIC
 
 TOPIC("RasterEncoder$en-us")