Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java	(revision 23834)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java	(revision 23835)
@@ -214,5 +214,4 @@
 			StreetNode sNode = streetDict.get(streetName);
 			sNode.addAddress(aNode);
-			//System.out.println("Resolved address " + aNode + ": " + sNode);
 			return true;
 		}
@@ -232,12 +231,8 @@
 		}
 		
-		System.out.println("Resolved " + resolvedAddresses.size() + " addresses");
-		
 		/* Remove all resolves nodes from unresolved list */
 		for (AddressNode resolved : resolvedAddresses) {
 			unresolvedAddresses.remove(resolved);
 		}
-		
-		System.out.println("Still unresolved: " + unresolvedAddresses.size() + " addresses");
 	}
 	
@@ -260,4 +255,7 @@
 		resolveAddresses();
 		
+		Collections.sort(incompleteAddresses);
+		Collections.sort(unresolvedAddresses);
+		
 		fireContainerChanged();
 	}
@@ -328,5 +326,4 @@
 	@Override
 	public void entityChanged() {
-		System.out.println("entityChanged, inavlidate... :-)");
 		invalidate();		
 	}
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23834)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23835)
@@ -118,9 +118,6 @@
 		JButton ok = new JButton(OK_COMMAND);
 		ok.addActionListener(this);
-		JButton cancel = new JButton(CANCEL_COMMAND);
-		cancel.addActionListener(this);
+		buttonPanel.add(ok);
 		
-		buttonPanel.add(cancel);
-		buttonPanel.add(ok);
 		// Murks
 		for (int i = 0; i < 8; i++) {
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditTableModel.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditTableModel.java	(revision 23834)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditTableModel.java	(revision 23835)
@@ -36,5 +36,4 @@
 	public void containerChanged(AddressEditContainer container) {
 		fireTableDataChanged();
-		System.out.println("Fire data table changed...");
 	}
 
@@ -42,5 +41,4 @@
 	public void entityChanged() {
 		fireTableDataChanged();
-		System.out.println("Fire data table changed...");
 	}
 }
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java	(revision 23834)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java	(revision 23835)
@@ -42,7 +42,7 @@
 public class UnresolvedAddressesTableModel extends AddressEditTableModel {
 
-	private static final int NUMBER_OF_COLUMNS = 2;
-	private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("Complete?")}; 
-	private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, Boolean.class};
+	private static final int NUMBER_OF_COLUMNS = 3;
+	private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("City"), tr("Complete?")}; 
+	private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, String.class, Boolean.class};
 	
 	/**
@@ -91,4 +91,6 @@
 			return aNode.getStreet();
 		case 1:
+			return aNode.getCity();
+		case 2:
 			return aNode.isComplete();
 		default: