Index: /applications/editors/josm/plugins/smed/plugs/harbour/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/harbour/build.xml	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/harbour/build.xml	(revision 27479)
@@ -40,5 +40,5 @@
      -->
     <property name="josm" location="../../../../core/dist/josm-custom.jar"/>
-    <property name="smed" location="../../core/dist/smed.jar"/>
+    <property name="smed" location="../../core/dist/SeaMapEditor.jar"/>
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.src.dir" value="src"/>
Index: /applications/editors/josm/plugins/smed/plugs/smed_about/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/smed_about/build.xml	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/smed_about/build.xml	(revision 27479)
@@ -40,5 +40,5 @@
      -->
     <property name="josm" location="../../../../core/dist/josm-custom.jar"/>
-    <property name="smed" location="../../core/dist/smed.jar"/>
+    <property name="smed" location="../../core/dist/SeaMapEditor.jar"/>
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.src.dir" value="src"/>
Index: /applications/editors/josm/plugins/smed/plugs/smed_about/src/smed_about/SmedAbout.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/smed_about/src/smed_about/SmedAbout.java	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/smed_about/src/smed_about/SmedAbout.java	(revision 27479)
@@ -91,10 +91,10 @@
             aboutCopyright.setBounds(new Rectangle(125, 0, 245, 55));
             aboutCopyright.setText("<HTML><BODY>Copyright (c) 2009/10/11<BR><center>by" +
-            				"<BR>Werner König & Malcolm Herring</BODY></HTML>");
+            				"<BR>Werner Knig & Malcolm Herring</BODY></HTML>");
 
             aboutAuthors = new JLabel();
             aboutAuthors.setBounds(new Rectangle(30, 50
             		, 340, 30));
-            aboutAuthors.setText("Authors: Werner König and Malcolm Herring");
+            aboutAuthors.setText("Authors: Werner Knig and Malcolm Herring");
 
             aboutVersion = new JLabel();
@@ -117,4 +117,5 @@
             aboutPlugins.setBounds(new Rectangle(58, 135, 303, 60));
             aboutPlugins.setText("<HTML><BODY>SeaMark Editor" +
+            		"<BR>Way & Area Editor" +
             		"<BR>Harbour Editor" +
             		"<BR>About - this tab</BODY></HTML>");
Index: /applications/editors/josm/plugins/smed/plugs/wayarea/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/wayarea/build.xml	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/wayarea/build.xml	(revision 27479)
@@ -83,6 +83,6 @@
             <fileset dir="images"/>
         </copy>
-        <copy todir="${plugin.build.dir}/oseam/msg">
-            <fileset dir="${plugin.src.dir}/oseam/msg"/>
+        <copy todir="${plugin.build.dir}/wayarea/msg">
+            <fileset dir="${plugin.src.dir}/wayarea/msg"/>
         </copy>
         <copy todir="${plugin.build.dir}">
@@ -110,6 +110,6 @@
                 <attribute name="Plugin-Class" value="toms.Toms"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Create and edit seamarks for OpenSeaMap"/>
-                <attribute name="Plugin-Icon" value="images/Smp.png"/>
+                <attribute name="Plugin-Description" value="Create and edit ways and areas for OpenSeaMap"/>
+                <attribute name="Plugin-Icon" value="images/wayarea.png"/>
                 <attribute name="Plugin-Link" value="http://openseamap.org/"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
Index: /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/Messages.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/Messages.java	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/Messages.java	(revision 27479)
@@ -5,5 +5,5 @@
 
 public class Messages {
-	private static final String BUNDLE_NAME = "oseam.msg.messages";
+	private static final String BUNDLE_NAME = "wayarea.msg.messages";
 
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
Index: /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/dialogs/WayAreaAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/dialogs/WayAreaAction.java	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/dialogs/WayAreaAction.java	(revision 27479)
@@ -39,5 +39,5 @@
 						node = null;
 //						panelMain.mark.clrMark();
-						manager.showVisualMessage(Messages.getString("OneNode"));
+//						manager.showVisualMessage(Messages.getString("OneNode"));
 					}
 				}
@@ -46,5 +46,5 @@
 				node = null;
 //				panelMain.mark.clrMark();
-				manager.showVisualMessage(Messages.getString("SelectNode"));
+//				manager.showVisualMessage(Messages.getString("SelectNode"));
 			}
 		}
Index: /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/panels/PanelMain.java	(revision 27478)
+++ /applications/editors/josm/plugins/smed/plugs/wayarea/src/wayarea/panels/PanelMain.java	(revision 27479)
@@ -13,4 +13,10 @@
 
 	private WayAreaAction dlg;
+//	public PanelF panelF = null;
+//	public PanelJ panelJ = null;
+//	public PanelK panelK = null;
+//	public PanelL panelL = null;
+//	public PanelM panelM = null;
+//	public PanelN panelN = null;
 	public JButton saveButton = null;
 	private ActionListener alSave = new ActionListener() {
@@ -87,11 +93,11 @@
 
 	public void syncPanel() {
-		typeButtons.clearSelection();
-		fButton.setBorderPainted(false);
-		jButton.setEnabled(false);
-		kButton.setBorderPainted(false);
-		lButton.setEnabled(false);
-		mButton.setBorderPainted(false);
-		nButton.setEnabled(false);
+//		typeButtons.clearSelection();
+//		fButton.setBorderPainted(false);
+//		jButton.setEnabled(false);
+//		kButton.setBorderPainted(false);
+//		lButton.setEnabled(false);
+//		mButton.setBorderPainted(false);
+//		nButton.setEnabled(false);
 	}
 
