diff --git a/factor/jedit/FactorCompletion.java b/factor/jedit/FactorCompletion.java
index 019c9220b4..d964e517a2 100644
--- a/factor/jedit/FactorCompletion.java
+++ b/factor/jedit/FactorCompletion.java
@@ -29,6 +29,7 @@
 
 package factor.jedit;
 
+import factor.*;
 import java.util.*;
 import javax.swing.ListCellRenderer;
 import org.gjt.sp.jedit.textarea.*;
@@ -53,8 +54,21 @@ public class FactorCompletion extends SideKickCompletion
 		this.data = data;
 	} //}}}
 
+	public String getLongestPrefix()
+	{
+		return "";
+	}
+
 	public void insert(int index)
 	{
+		Macros.Recorder recorder = view.getMacroRecorder();
+
+		String insert = ((FactorWord)get(index)).name.substring(
+			word.length());
+
+		if(recorder != null)
+			recorder.recordInput(insert,false);
+		textArea.setSelectedText(insert);
 	}
 
 	public int getTokenLength()
@@ -64,7 +78,23 @@ public class FactorCompletion extends SideKickCompletion
 
 	public boolean handleKeystroke(int selectedIndex, char keyChar)
 	{
-		return false;
+		Macros.Recorder recorder = view.getMacroRecorder();
+
+		boolean ws = (ReadTable.DEFAULT_READTABLE
+			.getCharacterType(keyChar)
+			== ReadTable.WHITESPACE);
+
+		if(ws)
+			insert(selectedIndex);
+
+		if(keyChar != '\n')
+		{
+			if(recorder != null)
+				recorder.recordInput(1,keyChar,false);
+			textArea.userInput(keyChar);
+		}
+
+		return !ws;
 	}
 
 	public ListCellRenderer getRenderer()
diff --git a/factor/jedit/FactorSideKickParser.java b/factor/jedit/FactorSideKickParser.java
index b5286ec4b2..01b63481e9 100644
--- a/factor/jedit/FactorSideKickParser.java
+++ b/factor/jedit/FactorSideKickParser.java
@@ -172,10 +172,7 @@ public class FactorSideKickParser extends SideKickParser
 		SideKickParsedData _data = SideKickParsedData
 			.getParsedData(editPane.getView());
 		if(!(_data instanceof FactorParsedData))
-		{
-			System.err.println("exit 1");
 			return null;
-		}
 		FactorParsedData data = (FactorParsedData)_data;
 
 		Buffer buffer = editPane.getBuffer();
@@ -192,7 +189,7 @@ public class FactorSideKickParser extends SideKickParser
 			if(ReadTable.DEFAULT_READTABLE.getCharacterType(ch)
 				== ReadTable.WHITESPACE)
 			{
-				wordStart = i;
+				wordStart = i + 1;
 				break;
 			}
 		}