diff --git a/build.xml b/build.xml
index 95df8b1..13f8f86 100644
--- a/build.xml
+++ b/build.xml
@@ -2,9 +2,9 @@
 <!-- ant build file for WoT -->
 
 <project name="WoT" default="dist" basedir=".">
-	<property name="freenet-cvs-snapshot.location" location="../fred/dist/freenet.jar"/>
-	<property name="freenet-ext.location" location="../fred/lib/freenet-ext.jar"/>
-	<property name="debug-node-wot-plugin.location" location="../fred/plugins/WoT.jar"/>
+	<property name="freenet-cvs-snapshot.location" location="../freenet.jar"/>
+	<property name="freenet-ext.location" location="../freenet-ext.jar"/>
+	<property name="debug-node-wot-plugin.location" location="../WoT.jar"/>
 	<property name="svn.revision" value="@custom@"/>
 	<property name="source-version" value="1.5"/>
 	<property name="target-version" value="1.5"/>
diff --git a/src/plugins/WoT/ui/web/EditOwnIdentityPage.java b/src/plugins/WoT/ui/web/EditOwnIdentityPage.java
index 49add44..441ed94 100644
--- a/src/plugins/WoT/ui/web/EditOwnIdentityPage.java
+++ b/src/plugins/WoT/ui/web/EditOwnIdentityPage.java
@@ -71,7 +71,7 @@ public class EditOwnIdentityPage extends WebPageImpl {
 					l10n().getString("EditOwnIdentityPage.EditIdentityBox.InsertUri") + ": " + mIdentity.getInsertURI().toString());
 			
 			// TODO Give the user the ability to edit these.
-			createForm.addChild("p", l10n().getString("EditOwnIdentityPage.EditIdentityBox.Contexts") + ": " + mIdentity.getContexts());
+			//createForm.addChild("p", l10n().getString("EditOwnIdentityPage.EditIdentityBox.Contexts") + ": " + mIdentity.getContexts());
 			createForm.addChild("p", l10n().getString("EditOwnIdentityPage.EditIdentityBox.Properties") + ": " + mIdentity.getProperties());
 			
 			HTMLNode p = createForm.addChild("p", l10n().getString("EditOwnIdentityPage.EditIdentityBox.PublishTrustList") + ": ");
@@ -84,11 +84,11 @@ public class EditOwnIdentityPage extends WebPageImpl {
 			
 			
 			p = createForm.addChild("p", l10n().getString("EditOwnIdentityPage.EditIdentityBox.PublishIntroductionPuzzles") + ": ");
-			if(mIdentity.hasContext(IntroductionPuzzle.INTRODUCTION_CONTEXT)) {
-				p.addChild("input", new String[] { "type", "name", "value", "checked" },
-						new String[] { "checkbox", "PublishPuzzles", "true", "checked"});
-			}
-			else
+			//if(mIdentity.hasContext(IntroductionPuzzle.INTRODUCTION_CONTEXT)) {
+			//		p.addChild("input", new String[] { "type", "name", "value", "checked" },
+			//			new String[] { "checkbox", "PublishPuzzles", "true", "checked"});//
+			//		}
+			//else
 				p.addChild("input", new String[] { "type", "name", "value" }, new String[] { "checkbox", "PublishPuzzles", "true"});
 			
 			createForm.addChild("input", new String[] { "type", "name", "value" }, new String[] { "submit", "Edit", l10n().getString("EditOwnIdentityPage.EditIdentityBox.SaveButton") });
@@ -96,3 +96,6 @@ public class EditOwnIdentityPage extends WebPageImpl {
 		}
 	}
 }
+
+
+
diff --git a/src/plugins/WoT/ui/web/IdentityPage.java b/src/plugins/WoT/ui/web/IdentityPage.java
index bc59116..343cbc4 100644
--- a/src/plugins/WoT/ui/web/IdentityPage.java
+++ b/src/plugins/WoT/ui/web/IdentityPage.java
@@ -117,13 +117,13 @@ public class IdentityPage extends WebPageImpl {
 	
 	private void makeServicesBox() {
 		HTMLNode boxContent = addContentBox(l10n().getString("IdentityPage.ServicesBox.Header", "nickname", identity.getNickname()));
-		Iterator<String> iter = identity.getContexts().iterator();
+		//Iterator<String> iter = identity.getContexts().iterator();
 		StringBuilder contexts = new StringBuilder(128);
-		while(iter.hasNext()) {
-			contexts.append(iter.next());
-			if(iter.hasNext())
-				contexts.append(", ");
-		}
+		//while(iter.hasNext()) {
+		// 	contexts.append(iter.next());
+		// 	if(iter.hasNext())
+		// 		contexts.append(", ");
+		// }
 		boxContent.addChild("p", contexts.toString());
 	}