diff --git a/binaries/images/connectedgui.jpg b/binaries/images/connectedgui.jpg
new file mode 100644
index 0000000..09bef46
Binary files /dev/null and b/binaries/images/connectedgui.jpg differ
diff --git a/binaries/jars/cuiagentloader.jar b/binaries/jars/cuiagentloader.jar
new file mode 100644
index 0000000..c46ad6e
Binary files /dev/null and b/binaries/jars/cuiagentloader.jar differ
diff --git a/org.intrace.agentloader/.classpath b/org.intrace.agentloader/.classpath
index f479401..76bd551 100644
--- a/org.intrace.agentloader/.classpath
+++ b/org.intrace.agentloader/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="C:/Program Files/Java/jdk1.6.0/lib/tools.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files/Java/jdk1.6.0_16/lib/tools.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.intrace.agentloader/build.xml b/org.intrace.agentloader/build.xml
index e677299..0f56841 100644
--- a/org.intrace.agentloader/build.xml
+++ b/org.intrace.agentloader/build.xml
@@ -1,29 +1,29 @@
 <project name="TraceAgent" basedir="." default="help">
-	<target name="help">
-		<java classname="org.apache.tools.ant.Main">
-			<arg value="-projecthelp" />
-		</java>
-	</target>
+  <target name="help">
+    <java classname="org.apache.tools.ant.Main">
+      <arg value="-projecthelp" />
+    </java>
+  </target>
 
-	<target name="build" depends="buildClasses, createJar" />
+  <target name="build" depends="buildClasses, createJar" />
 
-	<target name="buildClasses" description="Comile classes">
-		<delete dir="./bin" includes="**/*" />
-		<mkdir dir="./bin" />
+  <target name="buildClasses" description="Comile classes">
+    <delete dir="./bin"/>
+    <mkdir dir="./bin" />
 
-		<javac srcdir="./src" destdir="./bin" debug="true" source="1.6" target="1.6" nowarn="true" />
-	</target>
+    <javac srcdir="./src" destdir="./bin" debug="true" source="1.6" target="1.6" nowarn="true" />
+  </target>
 
-	<target name="createJar" description="Create the Agent Jar">
-		<mkdir dir="./built/" />
-		
-		<!-- CUI Agent Loader -->
-		<jar destfile="./built/cuiagentloader.jar" compress="false">
-			<manifest>
-				<attribute name="Main-Class" value="org.intrace.agentloader.AgentLoader" />
-				<attribute name="Class-Path" value="." />
-			</manifest>
-			<fileset dir="./bin" includes="**/*.class" />
-		</jar>
-	</target>
+  <target name="createJar" description="Create the Agent Jar">
+    <mkdir dir="./built/" />
+    
+    <!-- CUI Agent Loader -->
+    <jar destfile="./built/cuiagentloader.jar" compress="false">
+      <manifest>
+        <attribute name="Main-Class" value="org.intrace.agentloader.AgentLoader" />
+        <attribute name="Class-Path" value=". ./tools.jar" />
+      </manifest>
+      <fileset dir="./bin" includes="**/*.class" />
+    </jar>
+  </target>
 </project>
diff --git a/org.intrace.agentloader/src/org/intrace/agentloader/AgentLoader.java b/org.intrace.agentloader/src/org/intrace/agentloader/AgentLoader.java
index 96497eb..6eb83c2 100644
--- a/org.intrace.agentloader/src/org/intrace/agentloader/AgentLoader.java
+++ b/org.intrace.agentloader/src/org/intrace/agentloader/AgentLoader.java
@@ -67,19 +67,16 @@ public class AgentLoader
 
   private static void loadAgent(BufferedReader xiReadIn, VirtualMachine vm) throws Exception
   {
-    System.out.print("Enter path to agent jar (blank for windows default): ");
+    System.out.print("Enter path to agent jar (blank for default /traceagent.jar): ");
     String agentPath = xiReadIn.readLine();
-    String defaultAgentPath = "../TestProject/lib/traceagent.jar";
+    String defaultAgentPath = "/traceagent.jar";
     if ("".equals(agentPath))
     {
       agentPath = defaultAgentPath;
     }
-    System.out.println("Agent Options");
-    System.out.println("Leave blank for default: [regex-dcl.*");
-    System.out.println("After loading you can only enabled/disable trace");
     System.out.print("Enter agent options: ");
     String agentOptions = xiReadIn.readLine();
-    String defaultAgentOpt = "[regex-dcl.*";
+    String defaultAgentOpt = "";
     if ("".equals(agentOptions))
     {
       agentOptions = defaultAgentOpt;