Index: /applications/editors/josm/plugins/seachartedit/src/panels/PanelMain.java
===================================================================
--- /applications/editors/josm/plugins/seachartedit/src/panels/PanelMain.java	(revision 31059)
+++ /applications/editors/josm/plugins/seachartedit/src/panels/PanelMain.java	(revision 31060)
@@ -168,5 +168,5 @@
 						switch (item.conv) {
 						case E:
-							decode.append("\t\t\t" + Messages.getString(att.name()) + ": " + Messages.getString(((Enum<?>)item.val).name()) + "\n");
+							decode.append("\t\t\t" + Messages.getString(att.name()) + ": " + Messages.getString(((Enum<?>)((ArrayList<?>)item.val).get(0)).name()) + "\n");
 							break;
 						case L:
Index: /applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java
===================================================================
--- /applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java	(revision 31059)
+++ /applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java	(revision 31060)
@@ -204,5 +204,5 @@
 		for (Map.Entry<Att, AttVal<?>> item : feature.atts.entrySet()) {
 			String attstr = S57att.stringAttribute(item.getKey());
-			String valstr = S57val.stringValue(item.getValue());
+			String valstr = S57val.stringValue(item.getValue(), item.getKey());
 			if (!attstr.isEmpty() && !valstr.isEmpty()) {
 					keys.put(("seamark:" + type + ":" + attstr), valstr);
@@ -216,5 +216,5 @@
 				for (Map.Entry<Att, AttVal<?>> item : atts.entrySet()) {
 					String attstr = S57att.stringAttribute(item.getKey());
-					String valstr = S57val.stringValue(item.getValue());
+					String valstr = S57val.stringValue(item.getValue(), item.getKey());
 					if (!attstr.isEmpty() && !valstr.isEmpty()) {
 						if ((ix == 0) && (tab.size() == 1)) {
Index: /applications/editors/josm/plugins/seachartedit/src/panels/ShowFrame.java
===================================================================
--- /applications/editors/josm/plugins/seachartedit/src/panels/ShowFrame.java	(revision 31059)
+++ /applications/editors/josm/plugins/seachartedit/src/panels/ShowFrame.java	(revision 31060)
@@ -13,4 +13,5 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
@@ -23,4 +24,5 @@
 import render.ChartContext;
 import render.Renderer;
+import render.Rules.RuleSet;
 import s57.S57map;
 import s57.S57map.*;
@@ -53,6 +55,7 @@
 			Graphics2D g2 = (Graphics2D)g;
 			g2.setBackground(new Color(0xb5d0d0));
-			g2.clearRect(0, 0, 300, 300);
-			Renderer.reRender(g2, 16, 32, showMap, this);
+			Rectangle rect =  new Rectangle(0, 0, 300, 300);
+			g2.clearRect(rect.x, rect.y, rect.width, rect.height);
+			Renderer.reRender(g2, RuleSet.ALL, rect, 16, 32, showMap, this);
 		}
 
Index: /applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java
===================================================================
--- /applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java	(revision 31059)
+++ /applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java	(revision 31060)
@@ -35,5 +35,5 @@
 
 public class SCeditAction extends JosmAction implements EditLayerChangeListener, SelectionChangedListener {
-	private static String title = tr("SeaMap Editor");
+	private static String title = tr("SeaChart Editor");
 	public static JFrame editFrame = null;
 	public static ShowFrame showFrame = null;
@@ -88,5 +88,5 @@
 
 	public SCeditAction() {
-		super(title, "SCedit", title, null, true);
+		super(title, "SC", title, null, true);
 	}