--- a/net.rhope	Sun Nov 21 22:47:14 2010 -0500
+++ b/net.rhope	Mon Nov 22 01:15:02 2010 -0500
@@ -433,7 +433,7 @@
 		{
 			data,out con,err <- [con]_Read Delim[delim,poffset,buflist]
 		}{
-			err <- [Fold[_Add Len[?], 0, buflist]]+[Length[[con]Buffer >>]]
+			err <- [Fold[_Add Len[?], 0, buflist]]+[Length[[con]Read Buffer >>]]
 		}
 	}{
 		,checknew <- If[[poffset]>=[0]]
@@ -441,18 +441,18 @@
 			If[[[delim]Length]>[[outbuf]Length]]
 			{
 				//Avoid possibility of having to check across more than 2 buffers
-				data,out con,err <-[[con]Buffer <<[
-						_Merge Buffers[[[buflist]Append[[con]Buffer >>]]Append[outbuf]]
+				data,out con,err <-[[con]Read Buffer <<[
+						_Merge Buffers[[[buflist]Append[[con]Read Buffer >>]]Append[outbuf]]
 					]
 				]Read Delim[delim]
 			}{
-				,checknew <- _Check Split[[con]Buffer >>, outbuf, delim ,poffset]
+				,checknew <- _Check Split[[con]Read Buffer >>, outbuf, delim ,poffset]
 				{
 					before <- [_internal_array_copychunk[[con]Read Buffer >>, 0, _internal_array_allocnaked[~, UInt8()], 0, ~]
 					]Length <<[~]
 					
 					data <- _Merge Buffers[[buflist]Append[before]]
-					after off <- [[delim]Length]- [[[[con]Buffer >>]Length]-[~]]
+					after off <- [[delim]Length]- [[[[con]Read Buffer >>]Length]-[~]]
 					rbufferlen <- [[outbuf]Length]-[after off]
 					out con <- [con]Read Buffer <<[
 						[_internal_array_copychunk[outbuf, after off,