Index: src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 654)
+++ src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(working copy)
@@ -21,7 +21,7 @@
 import org.openstreetmap.josm.data.osm.Way;
 
 /**
- * Aligns all selected nodes within a circle. (Usefull for roundabouts)
+ * Aligns all selected nodes within a circle. (Useful for roundabouts)
  * 
  * @author Matthew Newton
  */
Index: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 654)
+++ src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(working copy)
@@ -32,8 +32,8 @@
  *
  * The user can click on an object, which get deleted if possible. When Ctrl is 
  * pressed when releasing the button, the objects and all its references are 
- * deleted. The exact definition of "all its references" are in 
- * @see #deleteWithReferences(OsmPrimitive)
+ * deleted. The exact definition of "all its references" are in
+ * {@link #deleteWithReferences deleteWithReferences}.
  *
  * If the user did not press Ctrl and the object has any references, the user
  * is informed and nothing is deleted.
Index: src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 654)
+++ src/org/openstreetmap/josm/tools/AudioPlayer.java	(working copy)
@@ -139,7 +139,7 @@
 	
 	/**
 	 * To get the Url of the playing or recently played audio.
-	 * @returns url - could be null
+	 * @return url - could be null
 	 */
 	public static URL url() {
 		return AudioPlayer.get().playingUrl;
@@ -147,7 +147,7 @@
 	
 	/**
 	 * Whether or not we are paused.
-	 * @returns boolean whether or not paused
+	 * @return boolean whether or not paused
 	 */
 	public static boolean paused() {
 		return AudioPlayer.get().state == State.PAUSED;
@@ -155,7 +155,7 @@
 
 	/**
 	 * Whether or not we are playing.
-	 * @returns boolean whether or not playing
+	 * @return boolean whether or not playing
 	 */
 	public static boolean playing() {
 		return AudioPlayer.get().state == State.PLAYING;
@@ -163,7 +163,7 @@
 
 	/**
 	 * How far we are through playing, in seconds.
-	 * @returns double seconds
+	 * @return double seconds
 	 */
 	public static double position() {
 		return AudioPlayer.get().position;
@@ -171,7 +171,7 @@
 	
 	/**
 	 * Speed at which we will play.
-	 * @returns double, speed multiplier
+	 * @return double, speed multiplier
 	 */
 	public static double speed() {
 		return AudioPlayer.get().speed;
Index: src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/NavigatableComponent.java	(working copy)
@@ -104,7 +104,7 @@
 
 	/**
 	 * Return the point on the screen where this Coordinate would be.
-	 * @param point The point, where this geopoint would be drawn.
+	 * @param p The point, where this geopoint would be drawn.
 	 * @return The point on screen where "point" would be drawn, relative
 	 * 		to the own top/left.
 	 */
@@ -116,8 +116,7 @@
 
 	/**
 	 * Zoom to the given coordinate.
-	 * @param centerX The center x-value (easting) to zoom to.
-	 * @param centerY The center y-value (northing) to zoom to.
+	 * @param newCenter The center x-value (easting) to zoom to.
 	 * @param scale The scale to use.
 	 */
 	public void zoomTo(EastNorth newCenter, double scale) {
Index: src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/SelectionManager.java	(working copy)
@@ -106,7 +106,7 @@
 	/**
 	 * Create a new SelectionManager.
 	 *
-	 * @param actionListener The action listener that receives the event when
+	 * @param selectionEndedListener The action listener that receives the event when
 	 * 		the left button is released.
 	 * @param aspectRatio If true, the selection window must obtain the aspect
 	 * 		ratio of the drawComponent.
Index: src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapStatus.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/MapStatus.java	(working copy)
@@ -250,7 +250,7 @@
 
 	/**
 	 * Construct a new MapStatus and attach it to the map view.
-	 * @param mv The MapView the status line is part of.
+	 * @param mapFrame The MapFrame the status line is part of.
 	 */
 	public MapStatus(final MapFrame mapFrame) {
 		this.mv = mapFrame.mapView;
Index: src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/layer/Layer.java	(working copy)
@@ -97,12 +97,7 @@
 	 * @return Whether the other layer can be merged into this layer.
 	 */
 	abstract public boolean isMergable(Layer other);
-	
-	/**
-	 * @return The bounding rectangle this layer occupies on screen when looking
-	 * 		at x/y values or <code>null</code>, if infinite area or unknown
-	 * 		area is occupied.
-	 */
+
 	abstract public void visitBoundingBox(BoundingXYVisitor v);
 
 	abstract public Object getInfoComponent();
Index: src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(working copy)
@@ -176,8 +176,7 @@
 	 * Returns an object of class Marker or one of its subclasses
 	 * created from the parameters given.
 	 *
-	 * @param ll lat/lon for marker
-	 * @param data hash containing keys and values from the GPX waypoint structure
+	 * @param wpt waypoint data for marker
 	 * @param relativePath An path to use for constructing relative URLs or 
 	 *        <code>null</code> for no relative URLs
 	 * @param offset double in seconds as the time offset of this marker from 
Index: src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java	(revision 654)
+++ src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java	(working copy)
@@ -18,8 +18,7 @@
 	 * Returns a Marker object if this implementation wants to create one for the
 	 * given input data, or <code>null</code> otherwise.
 	 * 
-	 * @param ll lat/lon for the marker position
-	 * @param data A map of all tags found in the <wpt> node of the gpx file. 
+	 * @param wp waypoint data 
 	 * @param relativePath An path to use for constructing relative URLs or 
 	 *        <code>null</code> for no relative URLs
 	 * @return A Marker object, or <code>null</code>.
Index: src/org/openstreetmap/josm/io/OsmServerObjectReader.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmServerObjectReader.java	(revision 654)
+++ src/org/openstreetmap/josm/io/OsmServerObjectReader.java	(working copy)
@@ -17,15 +17,15 @@
      public final static  String TYPE_NODE = "node";
      
      /**
-      * Method to download single Objects from OSM server. ways, relations, nodes
-      * @param id  Object ID
-      * @param type  way node relation
+      * Method to download single objects from OSM server. ways, relations, nodes
+      * @param id Object ID
+      * @param type way node relation
       * @param full download with or without child objects
-      * @return
+      * @return the data requested
       * @throws SAXException
       * @throws IOException
       */
-     public DataSet parseOsm(long id,String type, boolean full ) throws SAXException, IOException {
+     public DataSet parseOsm(long id, String type, boolean full) throws SAXException, IOException {
             try {
                 
                 Main.pleaseWaitDlg.progress.setValue(0);
Index: src/org/openstreetmap/josm/io/MyHttpHandler.java
===================================================================
--- src/org/openstreetmap/josm/io/MyHttpHandler.java	(revision 654)
+++ src/org/openstreetmap/josm/io/MyHttpHandler.java	(working copy)
@@ -22,7 +22,7 @@
                 return openConnection(u, (Proxy) null);
             }
             public MyHttpHandler(String proxy, int port) {
-                proxy = proxy;
+                this.proxy = proxy;
                 proxyPort = port;
             }
   
Index: src/org/openstreetmap/josm/data/projection/Projection.java
===================================================================
--- src/org/openstreetmap/josm/data/projection/Projection.java	(revision 654)
+++ src/org/openstreetmap/josm/data/projection/Projection.java	(working copy)
@@ -5,8 +5,8 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
- * Classes subclass this are able to convert lat/lon values to 
- * planear screen coordinates.
+ * Classes implementing this are able to convert lat/lon values to 
+ * planar screen coordinates.
  * 
  * @author imi
  */
@@ -17,7 +17,7 @@
 	public static final double MAX_SERVER_PRECISION = 1e12;
 
 	/**
-	 * List of all available Projections.
+	 * List of all available projections.
 	 */
 	public static Projection[] allProjections = new Projection[]{
 		new Epsg4326(),
Index: src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 654)
+++ src/org/openstreetmap/josm/data/gpx/WayPoint.java	(working copy)
@@ -32,8 +32,7 @@
 	}
 	
 	/**
-	 * convert the time stamp of ther waypoint into seconds from the epoch
-	 * @return seconds
+	 * Convert the time stamp of the waypoint into seconds from the epoch
 	 */
 	public void setTime () {
 		if (! attr.containsKey("time")) {
