Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22648)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22657)
@@ -1259,5 +1259,5 @@
 			bM01Close = new JButton();
 			bM01Close.setBounds(new Rectangle(20, 290, 80, 20));
-			bM01Close.setText("Cancel");
+			bM01Close.setText("Close");
 			bM01Close.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 22648)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 22657)
@@ -250,5 +250,5 @@
 
 			c = getLightChar();
-			if (c.compareTo("Q") == 0)
+			if (dlg.cbM01Kennung.getSelectedIndex() == 0)
 				dlg.tfM01RepeatTime.setEnabled(false);
 			else
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 22648)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 22657)
@@ -39,4 +39,8 @@
 		setRegion(Main.pref.get("tomsplugin.IALA").equals("B"));
 
+		dlg.cM01Fired.setSelected(false);
+		dlg.cM01TopMark.setSelected(false);
+		dlg.tbM01Region.setEnabled(true);
+
 		refreshStyles();