diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp
index 1ab64b1d6d..1f5f68f175 100644
--- a/firmware/controllers/trigger/trigger_structure.cpp
+++ b/firmware/controllers/trigger/trigger_structure.cpp
@@ -36,6 +36,7 @@ trigger_shape_helper::trigger_shape_helper() {
 TriggerShape::TriggerShape() :
 		wave(switchTimesBuffer, NULL) {
 	reset(OM_NONE, false);
+	clear();
 	wave.waves = h.waves;
 	// todo: false here, true in clear() what a mess!
 	useRiseEdge = false;
diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h
index 618d5d8aeb..657597157f 100644
--- a/firmware/controllers/trigger/trigger_structure.h
+++ b/firmware/controllers/trigger/trigger_structure.h
@@ -81,10 +81,13 @@ public:
 
 	/**
 	 * In case of a multi-channel trigger, do we want to sync based on primary channel only?
+	 * See also gapBothDirections
 	 */
 	bool_t useOnlyPrimaryForSync;
 	/**
-	 * Should we measure gaps with events of both kinds?
+	 * This is about selecting signal edges within partictular trigger channels.
+	 * Should we measure gaps with both fall and rise signal edges?
+	 * See also useOnlyPrimaryForSync
 	 */
 	bool_t gapBothDirections;
 
diff --git a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
index b651888536..4704cc2f5e 100644
--- a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
+++ b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
@@ -42,7 +42,7 @@ public class UpDownImage extends JPanel {
     private RevolutionLog time2rpm = RevolutionLog.parseRevolutions(null);
     private String pin = "";
     private long mouseEnterTime;
-    private Timer repaintTimer = new Timer(1000, new ActionListener() {
+    private final Timer repaintTimer = new Timer(1000, new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             UiUtils.trueRepaint(UpDownImage.this);
@@ -112,6 +112,11 @@ public class UpDownImage extends JPanel {
             public int getMinTime() {
                 return UpDownImage.this.wr.getMinTime();
             }
+
+            @Override
+            public String toString() {
+                return "TimeAxisTranslator " + zoomProvider;
+            }
         };
     }
 
@@ -285,4 +290,11 @@ public class UpDownImage extends JPanel {
         this.pin = pin;
         setToolTip();
     }
+
+    @Override
+    public String toString() {
+        return "UpDownImage{" +
+                "zoomProvider=" + zoomProvider +
+                "} " + super.toString();
+    }
 }