Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressFinderThread.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressFinderThread.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressFinderThread.java	(revision 24088)
@@ -33,4 +33,11 @@
 import org.xml.sax.SAXException;
 
+/**
+ * The class AddressFinderThread scans the data set to find the best guess for a missing address field.
+ * 
+ * The guessing procedure itself is implemented by defining "guessers" using the {@link GuessedValueHandler} 
+ * class. A guessed field does not modify the corresponding property of {@link AddressNode} itself, but 
+ * adds the guessed value to a shadowed field by calling {@link AddressNode#setGuessedValue(String, String)}.  
+ */
 public class AddressFinderThread extends PleaseWaitRunnable implements Visitor {
 	private List<AddressNode> addressesToGuess;
@@ -38,7 +45,5 @@
 	private double minDist;
 	private AddressNode curAddressNode;
-	private boolean isRunning = false;
-	private String nearestName = null;
-	private String currentName = null;
+	private boolean isRunning = false;	
 	private boolean cancelled;
 	
@@ -110,5 +115,4 @@
 		if (dist < minDist) {
 			minDist = dist;
-			nearestName = currentName;
 		}
 	}
@@ -123,5 +127,4 @@
 		if (!TagUtils.hasNameTag(w)) return;
 		
-		currentName = TagUtils.getNameValue(w);
 		for (Node node : w.getNodes()) {
 			visit(node);
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java	(revision 24088)
@@ -18,4 +18,8 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
+/**
+ * The class AddressNode represents a single address node of OSM. It is a lightweight 
+ * wrapper for a OSM node in order to simplify tag handling.
+ */
 public class AddressNode extends NodeEntityBase {
 	public static final String MISSING_TAG = "?";
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 24088)
@@ -18,8 +18,11 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 
+/**
+ * The Class FixAddressesPlugin is the main entry point for the plugin.
+ */
 public class FixAddressesPlugin extends Plugin {
 
 	/**
-	 * Constructor for the AddressEdit plugin.
+	 * Constructor for the AddressEdit plugin. Called by JOSM when loading the plugin.
 	 * @param info Context information of the plugin.
 	 */
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 24088)
@@ -16,15 +16,12 @@
 
 /**
- * Action to find and fix addresses without (valid) streets.
+ * Action to find and fix addresses without (valid) streets. It launches an dialog
+ * instance of {@link AddressEditDialog}.
+ * 
  * @author Oliver Wieland <oliver.wieland@online.de>
- * 
  */
 
+@SuppressWarnings("serial")
 public class FixUnresolvedStreetsAction extends JosmAction implements SelectionChangedListener {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
 	private AddressEditContainer addressEditContainer;
 	private Collection<? extends OsmPrimitive> newSelection;
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java	(revision 24088)
@@ -24,5 +24,6 @@
  * The guess is determined by finding the closest way/node with the given tag. If no appropriate node
  * is found within maximum distance, no guess is made.
-
+ * 
+ * The default maximum distance is 100m.
  */
 public class GuessedValueHandler implements Visitor {
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/ICommandListener.java	(revision 24088)
@@ -20,6 +20,6 @@
 	 * Called by a node entity if a command has been created. Clients may collect
 	 * these commands to define a sequence command.
-	 * @param entity
-	 * @param command
+	 * @param entity The entity which created/used the command.
+	 * @param command The command instance to process by the enclosing command listener.
 	 */
 	public void commandIssued(INodeEntity entity, Command command);
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeEntityBase.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeEntityBase.java	(revision 24028)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/NodeEntityBase.java	(revision 24088)
@@ -27,4 +27,14 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * The class NodeEntityBase provides a base implementation for the {@link INodeEntity} interface.
+ * 
+ * The implementation comprises
+ * <ol>
+ * <li>Handle change listeners
+ * <li>Links the corresponding OSM object
+ * <li>Tag handling
+ * </ol>
+ */
 public class NodeEntityBase implements INodeEntity, Comparable<INodeEntity> {
 	public static final String ANONYMOUS = tr("No name");