diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index bd4de39fb9..25b31e895e 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -35,7 +35,7 @@
 - NPE in ErrorHighlight
 - some way to not have previous definitions from a source file
   clutter the namespace
-- use inferior.factor for everything not just listener
+- ExternalFactor VocabularyLookup
 - fedit broken with listener
 - maple-like: press enter at old commands to evaluate there
 - completion in the listener
@@ -66,7 +66,6 @@
 - OOP
 - room. prints code heap size
 - refactor sort
-- ditch java factor
 - ditch object paths
 - browser responder for word links in HTTPd; inspect responder for
   objects
diff --git a/factor/jedit/FactorStream.java b/factor/jedit/FactorStream.java
index 773f003343..f4ccfa9563 100644
--- a/factor/jedit/FactorStream.java
+++ b/factor/jedit/FactorStream.java
@@ -48,10 +48,13 @@ public class FactorStream
 	public FactorStream(Socket socket) throws IOException
 	{
 		this.socket = socket;
-		this.in = new DataInputStream(socket.getInputStream());
-		this.out = new DataOutputStream(socket.getOutputStream());
+		this.in = new DataInputStream(new BufferedInputStream(
+			socket.getInputStream()));
+		this.out = new DataOutputStream(new BufferedOutputStream(
+			socket.getOutputStream()));
 
-		out.write("\"\\0\" write flush USE: jedit stream-server\n".getBytes("ASCII"));
+		out.write("\"\\0\" write flush USE: jedit stream-server\n"
+			.getBytes("ASCII"));
 		out.flush();
 
 		/* Read everything until prompt */
diff --git a/library/test/inference.factor b/library/test/inference.factor
index 70e0fb9a83..ca03c95faf 100644
--- a/library/test/inference.factor
+++ b/library/test/inference.factor
@@ -83,6 +83,9 @@ USE: lists
 
 [ [ bad-recursion-2 ] infer ] unit-test-fails
 
+! Simple combinators
+[ [ 1 | 2 ] [ [ car ] keep cdr ] infer ] unit-test
+
 [ [ 2 | 1 ] ] [ [ 2list ] infer ] unit-test
 [ [ 3 | 1 ] ] [ [ 3list ] infer ] unit-test
 [ [ 2 | 1 ] ] [ [ append ] infer ] unit-test