diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 4f41d5b03b..2d2c0fb73c 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -9,8 +9,8 @@
-
-
+
+
@@ -41,57 +41,57 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index d3a4d18557..c0822d8e9c 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -6,8 +6,8 @@ CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
-CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time-stretch-fill")
-CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time-stretch-outline")
+CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time stretch fill")
+CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time stretch outline")
CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
@@ -39,53 +39,53 @@ CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
-CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar")
-CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar")
-CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "rangemarker bar")
-CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar")
-CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "RangeDragBarRect")
-CANVAS_VARIABLE(canvasvar_RangeDragRect, "RangeDragRect")
-CANVAS_VARIABLE(canvasvar_TransportDragRect, "TransportDragRect")
-CANVAS_VARIABLE(canvasvar_MarkerDragLine, "MarkerDragLine")
-CANVAS_VARIABLE(canvasvar_TransportLoopRect, "TransportLoopRect")
-CANVAS_VARIABLE(canvasvar_TransportPunchRect, "TransportPunchRect")
-CANVAS_VARIABLE(canvasvar_PunchLine, "PunchLine")
-CANVAS_VARIABLE(canvasvar_ZoomRect, "ZoomRect")
-CANVAS_VARIABLE(canvasvar_RubberBandRect, "RubberBandRect")
-CANVAS_VARIABLE(canvasvar_EnteredGainLine, "EnteredGainLine")
-CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "EnteredAutomationLine")
-CANVAS_VARIABLE(canvasvar_EnteredMarker, "EnteredMarker")
-CANVAS_VARIABLE(canvasvar_MeterMarker, "MeterMarker")
-CANVAS_VARIABLE(canvasvar_TempoMarker, "TempoMarker")
-CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "MeasureLineBeat")
-CANVAS_VARIABLE(canvasvar_MeasureLineBar, "MeasureLineBar")
-CANVAS_VARIABLE(canvasvar_GhostTrackBase, "GhostTrackBase")
-CANVAS_VARIABLE(canvasvar_GhostTrackWave, "GhostTrackWave")
-CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "GhostTrackWaveClip")
-CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "GhostTrackZeroLine")
-CANVAS_VARIABLE(canvasvar_ImageTrack, "ImageTrack")
-CANVAS_VARIABLE(canvasvar_MarkerTrack, "MarkerTrack")
-CANVAS_VARIABLE(canvasvar_ZeroLine, "ZeroLine")
-CANVAS_VARIABLE(canvasvar_GainLine, "GainLine")
-CANVAS_VARIABLE(canvasvar_GainLineInactive, "GainLineInactive")
-CANVAS_VARIABLE(canvasvar_RecordingRect, "RecordingRect")
-CANVAS_VARIABLE(canvasvar_SelectionRect, "SelectionRect")
-CANVAS_VARIABLE(canvasvar_Selection, "Selection")
-CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame")
-CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "TimeAxisFrame")
-CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill")
-CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline")
-CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle")
-CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "TrimHandleLocked")
-CANVAS_VARIABLE(canvasvar_TrimHandle, "TrimHandle")
-CANVAS_VARIABLE(canvasvar_EditPoint, "EditPoint")
-CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "MidiSelectRectOutline")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "MidiSelectRectFill")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "MidiNoteOutlineMin")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "MidiNoteOutlineMid")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "MidiNoteOutlineMax")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "MidiNoteFillMin")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "MidiNoteFillMid")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "MidiNoteFillMax")
-CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "MidiNoteSelectedOutline")
+CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
+CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
+CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
+CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
+CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
+CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
+CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
+CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
+CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
+CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
+CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
+CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
+CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
+CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
+CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
+CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
+CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
+CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
+CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
+CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
+CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
+CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
+CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
+CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
+CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
+CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
+CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
+CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
+CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
+CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
+CANVAS_VARIABLE(canvasvar_Selection, "selection")
+CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
+CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
+CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
+CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
+CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
+CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
+CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
+CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "midi note fill max")
+CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 30577e11ef..8315b3c88a 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1101,7 +1101,7 @@ Editor::edit_cursor_backward ()
void
Editor::edit_cursor_forward ()
{
- nframes_t pos;
+ //nframes_t pos;
nframes_t cnt;
bool was_floating;
float prefix;