Index: /applications/editors/josm/plugins/smed2/src/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/panels/PanelMain.java	(revision 30036)
+++ /applications/editors/josm/plugins/smed2/src/panels/PanelMain.java	(revision 30037)
@@ -137,5 +137,5 @@
 	
 	public void parseMark(Feature feature) {
-		decode.setText("Selected feature:\n");
+		decode.setText("Selected object:\n");
 		decode.append("\t" + tr("Type") + ": " + Messages.getString(feature.type.name()) + "\n");
 		if (feature.atts.get(Att.OBJNAM) != null) {
@@ -175,5 +175,5 @@
 	
 	public void clearMark() {
-		decode.setText(tr("No feature selected"));
+		decode.setText(tr("No object selected"));
 	}
 	
Index: /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java	(revision 30036)
+++ /applications/editors/josm/plugins/smed2/src/seamap/Renderer.java	(revision 30037)
@@ -56,15 +56,12 @@
 		Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), null, null);
 	}
-	
 	public static void symbol(Feature feature, Symbol symbol, Scheme scheme) {
 		Point2D point = context.getPoint(feature.centre);
 		Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), scheme, null);
 	}
-	
 	public static void symbol(Feature feature, Symbol symbol, Delta delta) {
 		Point2D point = context.getPoint(feature.centre);
 		Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), null, delta);
 	}
-	
 	public static void symbol(Feature feature, Symbol symbol, Scheme scheme, Delta delta) {
 		Point2D point = context.getPoint(feature.centre);
@@ -362,4 +359,13 @@
 	}
 
+	public static void labelText(Feature feature, String str, Font font, LabelStyle style, Color fg) {
+		labelText(feature, str, font, style, fg, null, null);
+	}
+	public static void labelText(Feature feature, String str, Font font, LabelStyle style, Color fg, Color bg) {
+		labelText(feature, str, font, style, fg, bg, null);
+	}
+	public static void labelText(Feature feature, String str, Font font, LabelStyle style, Color fg, Delta delta) {
+		labelText(feature, str, font, style, fg, null, delta);
+	}
 	public static void labelText(Feature feature, String str, Font font, LabelStyle style, Color fg, Color bg, Delta delta) {
 		if (delta == null) delta = new Delta(Handle.CC);
Index: /applications/editors/josm/plugins/smed2/src/seamap/Rules.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/seamap/Rules.java	(revision 30036)
+++ /applications/editors/josm/plugins/smed2/src/seamap/Rules.java	(revision 30037)
@@ -80,11 +80,11 @@
 		if ((objects = map.features.get(Obj.LITMIN)) != null) for (Feature feature : objects) lights(feature);
 		if ((objects = map.features.get(Obj.LIGHTS)) != null) for (Feature feature : objects) lights(feature);
-		if ((objects = map.features.get(Obj.SISTAT)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.SISTAW)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.CGUSTA)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.RDOSTA)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.RADSTA)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.RSCSTA)) != null) for (Feature feature : objects) signals(feature);
-		if ((objects = map.features.get(Obj.PILBOP)) != null) for (Feature feature : objects) signals(feature);
+		if ((objects = map.features.get(Obj.SISTAT)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.SISTAW)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.CGUSTA)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.RDOSTA)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.RADSTA)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.RSCSTA)) != null) for (Feature feature : objects) stations(feature);
+		if ((objects = map.features.get(Obj.PILBOP)) != null) for (Feature feature : objects) stations(feature);
 		if ((objects = map.features.get(Obj.WTWGAG)) != null) for (Feature feature : objects) gauges(feature);
 		if ((objects = map.features.get(Obj.OFSPLF)) != null) for (Feature feature : objects) platforms(feature);
@@ -114,7 +114,7 @@
 				Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, new Color(0x40ffffff, true)));
 			else
-				Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, null));
+				Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }));
 			if ((zoom >= 12) && (name != null))
-				Renderer.labelText(feature, name, new Font("Arial", Font.PLAIN, 100), LabelStyle.NONE, Color.black, null, null);
+				Renderer.labelText(feature, name, new Font("Arial", Font.PLAIN, 100), LabelStyle.NONE, Color.black);
 			break;
 		case FAIRWY:
@@ -123,8 +123,8 @@
 					Renderer.lineVector(feature, new LineStyle(Mline, 8, new float[] { 50, 50 }, new Color(0x40ffffff, true)));
 				else
-					Renderer.lineVector(feature, new LineStyle(Mline, 8, new float[] { 50, 50 }, null));
+					Renderer.lineVector(feature, new LineStyle(Mline, 8, new float[] { 50, 50 }));
 			} else {
 				if (zoom >= 14)
-					Renderer.lineVector(feature, new LineStyle(new Color(0x40ffffff, true), 0, null, null));
+					Renderer.lineVector(feature, new LineStyle(null, 0, new Color(0x40ffffff, true)));
 			}
 			break;
@@ -133,12 +133,12 @@
 				Renderer.symbol(feature, Areas.MarineFarm);
 			if (zoom >= 16)
-				Renderer.lineVector(feature, new LineStyle( Color.black, 4, new float[] { 10, 10 }, null));
+				Renderer.lineVector(feature, new LineStyle(Color.black, 4, new float[] { 10, 10 }));
 			break;
 		case OSPARE:
 			if (Util.testAttribute(feature, feature.type, Att.CATPRA, CatPRA.PRA_WFRM)) {
 				Renderer.symbol(feature, Areas.WindFarm);
-				Renderer.lineVector(feature, new LineStyle(Color.black, 20, new float[] { 40, 40 }, null));
+				Renderer.lineVector(feature, new LineStyle(Color.black, 20, new float[] { 40, 40 }));
 				if ((zoom >= 15) && (name != null))
-					Renderer.labelText(feature, name, new Font("Arial", Font.BOLD, 80), LabelStyle.NONE, Color.black, null, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 10)));
+					Renderer.labelText(feature, name, new Font("Arial", Font.BOLD, 80), LabelStyle.NONE, Color.black, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 10)));
 			}
 			break;
@@ -210,5 +210,5 @@
 			}
 			if ((zoom >= 15) && (name != null))
-				Renderer.labelText(feature, name, new Font("Arial", Font.BOLD, 80), LabelStyle.NONE, Color.black, null, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
+				Renderer.labelText(feature, name, new Font("Arial", Font.BOLD, 80), LabelStyle.NONE, Color.black, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
 			break;
 		default:
@@ -856,5 +856,5 @@
 	}
 	
-	private static void signals(Feature feature) {
+	private static void stations(Feature feature) {
 		if (zoom >= 14) {
 			switch (feature.type) {
Index: /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java	(revision 30036)
+++ /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java	(revision 30037)
@@ -193,5 +193,5 @@
 				} else {
 					showFrame.setVisible(false);
-					PanelMain.messageBar.setText(tr("Select only one feature"));
+					PanelMain.messageBar.setText(tr("Select only one object"));
 				}
 			}
@@ -200,5 +200,5 @@
 				panelMain.clearMark();
 				showFrame.setVisible(false);
-				PanelMain.messageBar.setText(tr("Select a map feature"));
+				PanelMain.messageBar.setText(tr("Select a map object"));
 			}
 		}
Index: /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java	(revision 30036)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Symbols.java	(revision 30037)
@@ -91,4 +91,22 @@
 		public Color fill;
 
+		public LineStyle(Color iline, float iwidth) {
+			line = iline;
+			width = iwidth;
+			dash = null;
+			fill = null;
+		}
+		public LineStyle(Color iline, float iwidth, float[] idash) {
+			line = iline;
+			width = iwidth;
+			dash = idash;
+			fill = null;
+		}
+		public LineStyle(Color iline, float iwidth, Color ifill) {
+			line = iline;
+			width = iwidth;
+			dash = null;
+			fill = ifill;
+		}
 		public LineStyle(Color iline, float iwidth, float[] idash, Color ifill) {
 			line = iline;