diff --git a/src/qudi/gui/terascan/terascan_gui.py b/src/qudi/gui/terascan/terascan_gui.py
index 61bf4f7..db77418 100644
--- a/src/qudi/gui/terascan/terascan_gui.py
+++ b/src/qudi/gui/terascan/terascan_gui.py
@@ -85,9 +85,13 @@ def on_activate(self):
         self._mw = TerascanMainWindow()
         # ← populate start/stop λ in nm from the logic’s µm values
         # TODO: Should I do this with a signal from the logic instead?
+        # TODO: Why isn't this working?
         logic = self._terascan_logic()
         self._mw.start_wavelength.setValue(logic.get_start_wavelength())
         self._mw.stop_wavelength.setValue(logic.get_stop_wavelength())
+        # same for rate and teyp
+        self._mw.scan_rate.setCurrentIndex(logic.get_scan_rate())
+        self._mw.scan_type.setCurrentIndex(logic.get_scan_type())
 
         # populate combo-boxes with entries from the logic
         for txt, scan_type in self._terascan_logic().scan_types.items():
@@ -172,6 +176,11 @@ def _start_stop_pressed(self):
         if self._mw.start_stop_button.text() == 'Start Measurement':
             self.sigStartMeasurement.emit()
             self._terascan_logic().clear_data()
+            # TODO: This should be a signal
+            self._terascan_logic().clear_data()
+            start_wl = self._terascan_logic().start_wavelength
+            stop_wl = self._terascan_logic().stop_wavelength
+            self._mw.plot_widget.setXRange(start_wl, stop_wl)
         else:
             self.sigStopMeasurement.emit()
 
diff --git a/src/qudi/hardware/laser/solstis_laser.py b/src/qudi/hardware/laser/solstis_laser.py
index 1777805..4a2e18c 100644
--- a/src/qudi/hardware/laser/solstis_laser.py
+++ b/src/qudi/hardware/laser/solstis_laser.py
@@ -406,7 +406,7 @@ def __status_update(self):
     class TeraScanType(Enum):
         SCAN_TYPE_MEDIUM = 1
         SCAN_TYPE_FINE = 2
-        SCAN_TYPE_LINE = 3
+        # SCAN_TYPE_LINE = 3  # We don't have this capability yet
 
     class TeraScanRate(Enum):
         SCAN_RATE_MEDIUM_100_GHZ = 4
@@ -431,7 +431,7 @@ class TeraScanRate(Enum):
         SCAN_RATE_FINE_LINE_5_MHZ = 23
         SCAN_RATE_FINE_LINE_2_MHZ = 24
         SCAN_RATE_FINE_LINE_1_MHZ = 25
-        SCAN_RATE_LINE_500_KHZ = 26
-        SCAN_RATE_LINE_200_KHZ = 27
-        SCAN_RATE_LINE_100_KHZ = 28
-        SCAN_RATE_LINE_50_KHZ = 29
\ No newline at end of file
+        # SCAN_RATE_LINE_500_KHZ = 26
+        # SCAN_RATE_LINE_200_KHZ = 27
+        # SCAN_RATE_LINE_100_KHZ = 28
+        # SCAN_RATE_LINE_50_KHZ = 29
\ No newline at end of file