diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index e267e5496d..487d65a19c 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -22,6 +22,7 @@
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/table.h>
 
@@ -258,6 +259,13 @@ AddRouteDialog::track_type_chosen ()
 		instrument_label.set_sensitive (true);
 		break;
 	case MixedTrack:
+          	{
+			MessageDialog msg (_("Audio+MIDI tracks are intended for use <b>ONLY</b> with plugins that use both audio and MIDI input data\n\n"
+					     "If you do not plan to use such a plugin, then use a normal audio or MIDI track instead."),
+					   true, MESSAGE_INFO, BUTTONS_OK, true);
+			msg.set_position (WIN_POS_MOUSE);
+			msg.run ();
+	        }
 		channel_combo.set_sensitive (true);
 		mode_combo.set_sensitive (true);
 		instrument_combo.set_sensitive (true);
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index aca08444df..7bfac45594 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -11,6 +11,7 @@
   <accelerator action='track-solo-toggle'/>
   <accelerator action='track-mute-toggle'/>
   <accelerator action='toggle-edit-mode'/>
+  <accelerator action='toggle-midi-input-active'/>
   
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
@@ -59,6 +60,7 @@
         <menuitem action='main-menu-play-selected-regions'/>
         <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
+        <menuitem action='PlayPreroll'/>
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
@@ -143,12 +145,14 @@
       <menuitem action='TogglePunchIn'/>
       <menuitem action='TogglePunchOut'/>
       <menuitem action='ToggleAutoInput'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='ToggleAutoPlay'/>
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
-      <separator/>
+     <separator/>
     </menu>
 
     <menu name='Edit' action='Edit'>
@@ -219,6 +223,7 @@
         <menuitem action='set-tempo-from-region'/>
         <menuitem action='set-tempo-from-edit-range'/>
       </menu>
+      <menuitem action='set-mouse-mode-object-range'/>
 #ifndef GTKOSX
       <separator/>
       <menuitem action='ToggleRCOptionsEditor'/>
diff --git a/gtk2_ardour/ardour3_fonts.rc.in b/gtk2_ardour/ardour3_fonts.rc.in
index 8263704251..49941c078a 100644
--- a/gtk2_ardour/ardour3_fonts.rc.in
+++ b/gtk2_ardour/ardour3_fonts.rc.in
@@ -13,6 +13,11 @@ style "small_text"
  	font_name = "@FONT_SMALL@"
 }
 
+style "small_mono_text"
+{
+ 	font_name = "bold monospace @FONT_SMALL@"
+}
+
 style "small_italic_text"
 {
 	font_name = "italic @FONT_SMALL@"
@@ -50,6 +55,11 @@ style "large_bold_text"
  	font_name = "bold @FONT_LARGE@"
 }
 
+style "large_bold_mono_text"
+{
+ 	font_name = "bold monospace @FONT_BIGGER@"
+}
+
 style "larger_text"
 {
  	font_name = "@FONT_LARGE@"
@@ -60,6 +70,11 @@ style "massive_text"
  	font_name = "@FONT_MASSIVE@"
 }
 
+style "monospace massive_text"
+{
+  	font_name = "bold monospace @FONT_MASSIVE@"
+}
+
 style "larger_bold_text"
 {
  	font_name = "bold @FONT_LARGE@"
diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index a80cea4b05..4e18ce068a 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -562,11 +562,17 @@ style "warning_message" = "medium_text"
 style "medium_entry" = "medium_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 	fg[SELECTED] = @@COLPREFIX@_fg_selected
-	
+
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
-	
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
 	base[SELECTED] = @@COLPREFIX@_bg_selected
@@ -574,40 +580,52 @@ style "medium_entry" = "medium_text"
 
 style "medium_entry_noselection_fg" = "medium_entry"
 {
+        # this seems wrong to me, but the light theme uses it
 	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
 }
 
 style "medium_entry_noselection_bg" = "medium_entry"
 {
+        # this seems wrong to me, but the light theme uses it
 	bg[SELECTED] = @@COLPREFIX@_text
 }
 
 style "medium_bold_entry"  = "medium_bold_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
 	
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
 	
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "small_entry" = "small_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
+
 	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	text[ACTIVE] = @@COLPREFIX@_text
 	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
 	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "red_active_small_entry" = "small_entry"
@@ -619,13 +637,20 @@ style "red_active_small_entry" = "small_entry"
 style "small_bold_entry" = "small_bold_text"
 {
 	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
+
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+
 	bg[NORMAL] = @@COLPREFIX@_base
-	
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_bg_selected
+
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "small_red_on_black_entry"  = "small_bold_text"
@@ -839,6 +864,9 @@ style "peak_display_peaked_entry" = "small_text"
 	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_text
 	fg[SELECTED] = @@COLPREFIX@_text
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_text
 
         bg[NORMAL] = @@COLPREFIX@_bright_indicator
         bg[ACTIVE] = @@COLPREFIX@_bright_indicator
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index a6364f9f80..33360fb568 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -340,6 +340,16 @@ style "inspector_processor_list" = "processor_list"
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
+style "time_info_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
+style "status_bar_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
 ##include ardour3_dark_fonts.rc
 ##include ardour3_dark_styles.rc
 ##include ardour3_widgets.rc
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 663c153c4f..b6678035ad 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -146,10 +146,7 @@
     <Option name="zero line" value="b5b5b525"/>
     <Option name="zoom rect" value="c6d1b26d"/>
     <Option name="monitor knob" value="329edfff"/>
-    <Option name="processor prefader: border start" value="630a0aff"/>
-    <Option name="processor prefader: border end" value="630a0aff"/>
-    <Option name="processor prefader: border start selected" value="edc400ff"/>
-    <Option name="processor prefader: border end selected" value="ffd300ff"/>
+    <Option name="button border" value="000000f0"/>
     <Option name="processor prefader: fill start" value="873c3cff"/>
     <Option name="processor prefader: fill end" value="542525ff"/>
     <Option name="processor prefader: fill start active" value="873c3cff"/>
@@ -158,10 +155,6 @@
     <Option name="processor prefader: led active" value="78cb4eff"/>
     <Option name="processor prefader: text" value="aaaaa3ff"/>
     <Option name="processor prefader: text active" value="eeeeecff"/>
-    <Option name="processor fader: border start" value="7cb5d9ff"/>
-    <Option name="processor fader: border end" value="6493b0ff"/>
-    <Option name="processor fader: border start selected" value="cdfaf8ff"/>
-    <Option name="processor fader: border end selected" value="c0ebe9ff"/>
     <Option name="processor fader: fill start" value="5d90b0ff"/>
     <Option name="processor fader: fill end" value="154c6eff"/>
     <Option name="processor fader: fill start active" value="5d90b0ff"/>
@@ -170,10 +163,6 @@
     <Option name="processor fader: led active" value="78cb4eff"/>
     <Option name="processor fader: text" value="aaaaa3ff"/>
     <Option name="processor fader: text active" value="eeeeecff"/>
-    <Option name="processor postfader: border start" value="1d631dff"/>
-    <Option name="processor postfader: border end" value="1d631dff"/>
-    <Option name="processor postfader: border start selected" value="46f046ff"/>
-    <Option name="processor postfader: border end selected" value="46f046ff"/>
     <Option name="processor postfader: fill start" value="415947ff"/>
     <Option name="processor postfader: fill end" value="202d23ff"/>
     <Option name="processor postfader: fill start active" value="415947ff"/>
@@ -182,10 +171,6 @@
     <Option name="processor postfader: led active" value="78cb4eff"/>
     <Option name="processor postfader: text" value="aaaaa3ff"/>
     <Option name="processor postfader: text active" value="eeeeecff"/>
-    <Option name="processor control button: border start" value="000000ff"/>
-    <Option name="processor control button: border end" value="000000ff"/>
-    <Option name="processor control button: border start selected" value="000000ff"/>
-    <Option name="processor control button: border end selected" value="000000ff"/>
     <Option name="processor control button: fill start" value="000000ff"/>
     <Option name="processor control button: fill end" value="000000ff"/>
     <Option name="processor control button: fill start active" value="000000ff"/>
@@ -194,10 +179,6 @@
     <Option name="processor control button: led active" value="ff0000ff"/>
     <Option name="processor control button: text" value="ffffffff"/>
     <Option name="processor control button: text active" value="ffffffff"/>
-    <Option name="monitor button: border start" value="889488ff"/>
-    <Option name="monitor button: border end" value="004f00ff"/>
-    <Option name="monitor button: border start selected" value="9a908eff"/>
-    <Option name="monitor button: border end selected" value="675c5bff"/>
     <Option name="monitor button: fill start" value="5d5856ff"/>
     <Option name="monitor button: fill end" value="564d48ff"/>
     <Option name="monitor button: fill start active" value="46a344ff"/>
@@ -206,10 +187,6 @@
     <Option name="monitor button: led active" value="ff0000ff"/>
     <Option name="monitor button: text" value="aaaaa3ff"/>
     <Option name="monitor button: text active" value="1a1a1aff"/>
-    <Option name="solo isolate: border start" value="b7b7d2ff"/>
-    <Option name="solo isolate: border end" value="000000ff"/>
-    <Option name="solo isolate: border start selected" value="9a908eff"/>
-    <Option name="solo isolate: border end selected" value="675c5bff"/>
     <Option name="solo isolate: fill start" value="5d5856ff"/>
     <Option name="solo isolate: fill end" value="564d48ff"/>
     <Option name="solo isolate: fill start active" value="5d5856ff"/>
@@ -218,10 +195,6 @@
     <Option name="solo isolate: led active" value="ff0000ff"/>
     <Option name="solo isolate: text" value="c7c7d8ff"/>
     <Option name="solo isolate: text active" value="c8c8d9ff"/>
-    <Option name="solo safe: border start" value="b7b7d2ff"/>
-    <Option name="solo safe: border end" value="000000ff"/>
-    <Option name="solo safe: border start selected" value="9a908eff"/>
-    <Option name="solo safe: border end selected" value="675c5bff"/>
     <Option name="solo safe: fill start" value="5d5856ff"/>
     <Option name="solo safe: fill end" value="564d48ff"/>
     <Option name="solo safe: fill start active" value="5d5856ff"/>
@@ -230,10 +203,6 @@
     <Option name="solo safe: led active" value="ff0000ff"/>
     <Option name="solo safe: text" value="c7c7d8ff"/>
     <Option name="solo safe: text active" value="c8c8d9ff"/>
-    <Option name="monitor section cut: border start" value="b7b7d2ff"/>
-    <Option name="monitor section cut: border end" value="000000ff"/>
-    <Option name="monitor section cut: border start selected" value="9a908e00"/>
-    <Option name="monitor section cut: border end selected" value="675c5b00"/>
     <Option name="monitor section cut: fill start" value="5d5856ff"/>
     <Option name="monitor section cut: fill end" value="564d48ff"/>
     <Option name="monitor section cut: fill start active" value="f7bb0aff"/>
@@ -242,10 +211,6 @@
     <Option name="monitor section cut: led active" value="78cb4eff"/>
     <Option name="monitor section cut: text" value="c7c7d8ff"/>
     <Option name="monitor section cut: text active" value="000000ff"/>
-    <Option name="monitor section dim: border start" value="b7b7d2ff"/>
-    <Option name="monitor section dim: border end" value="000000ff"/>
-    <Option name="monitor section dim: border start selected" value="9a908eff"/>
-    <Option name="monitor section dim: border end selected" value="675b5bff"/>
     <Option name="monitor section dim: fill start" value="5d5856ff"/>
     <Option name="monitor section dim: fill end" value="564d48ff"/>
     <Option name="monitor section dim: fill start active" value="04af02ff"/>
@@ -254,10 +219,6 @@
     <Option name="monitor section dim: led active" value="78cb4eff"/>
     <Option name="monitor section dim: text" value="c8c8d9ff"/>
     <Option name="monitor section dim: text active" value="c8c8d9ff"/>
-    <Option name="monitor section solo: border start" value="b7b7d2ff"/>
-    <Option name="monitor section solo: border end" value="000000ff"/>
-    <Option name="monitor section solo: border start selected" value="9a908eff"/>
-    <Option name="monitor section solo: border end selected" value="675c5bff"/>
     <Option name="monitor section solo: fill start" value="5d5856ff"/>
     <Option name="monitor section solo: fill end" value="564d48ff"/>
     <Option name="monitor section solo: fill start active" value="f4f395ff"/>
@@ -266,10 +227,6 @@
     <Option name="monitor section solo: led active" value="ffa500ff"/>
     <Option name="monitor section solo: text" value="00000000"/>
     <Option name="monitor section solo: text active" value="00000000"/>
-    <Option name="monitor section invert: border start" value="b7b7d2ff"/>
-    <Option name="monitor section invert: border end" value="000000ff"/>
-    <Option name="monitor section invert: border start selected" value="9a908eff"/>
-    <Option name="monitor section invert: border end selected" value="675c5b00"/>
     <Option name="monitor section invert: fill start" value="5d5856ff"/>
     <Option name="monitor section invert: fill end" value="564d48ff"/>
     <Option name="monitor section invert: fill start active" value="03af01ff"/>
@@ -278,10 +235,6 @@
     <Option name="monitor section invert: led active" value="78cb4eff"/>
     <Option name="monitor section invert: text" value="00000000"/>
     <Option name="monitor section invert: text active" value="00000000"/>
-    <Option name="monitor section mono: border start" value="b7b7d2ff"/>
-    <Option name="monitor section mono: border end" value="000000ff"/>
-    <Option name="monitor section mono: border start selected" value="9a908eff"/>
-    <Option name="monitor section mono: border end selected" value="675c5bff"/>
     <Option name="monitor section mono: fill start" value="5d5856ff"/>
     <Option name="monitor section mono: fill end" value="564d48ff"/>
     <Option name="monitor section mono: fill start active" value="04af02ff"/>
@@ -290,10 +243,6 @@
     <Option name="monitor section mono: led active" value="78cb4eff"/>
     <Option name="monitor section mono: text" value="c7c7d8ff"/>
     <Option name="monitor section mono: text active" value="c8c8d9ff"/>
-    <Option name="monitor section solo model: border start" value="b7b7d2ff"/>
-    <Option name="monitor section solo model: border end" value="000000ff"/>
-    <Option name="monitor section solo model: border start selected" value="9a908eff"/>
-    <Option name="monitor section solo model: border end selected" value="675c5bff"/>
     <Option name="monitor section solo model: fill start" value="5d5856ff"/>
     <Option name="monitor section solo model: fill end" value="564d48ff"/>
     <Option name="monitor section solo model: fill start active" value="5d5856ff"/>
@@ -302,10 +251,6 @@
     <Option name="monitor section solo model: led active" value="ffa500ff"/>
     <Option name="monitor section solo model: text" value="c7c7d8ff"/>
     <Option name="monitor section solo model: text active" value="c8c8d9ff"/>
-    <Option name="monitor solo override: border start" value="b7b7d2ff"/>
-    <Option name="monitor solo override: border end" value="000000ff"/>
-    <Option name="monitor solo override: border start selected" value="9a908eff"/>
-    <Option name="monitor solo override: border end selected" value="675c5bff"/>
     <Option name="monitor solo override: fill start" value="5d5856ff"/>
     <Option name="monitor solo override: fill end" value="564d48ff"/>
     <Option name="monitor solo override: fill start active" value="5d5856ff"/>
@@ -314,10 +259,6 @@
     <Option name="monitor solo override: led active" value="ffa500ff"/>
     <Option name="monitor solo override: text" value="c7c7d8ff"/>
     <Option name="monitor solo override: text active" value="c8c8d9ff"/>
-    <Option name="monitor solo exclusive: border start" value="b7b7d2ff"/>
-    <Option name="monitor solo exclusive: border end" value="000000ff"/>
-    <Option name="monitor solo exclusive: border start selected" value="9a908eff"/>
-    <Option name="monitor solo exclusive: border end selected" value="675c5bff"/>
     <Option name="monitor solo exclusive: fill start" value="5d5856ff"/>
     <Option name="monitor solo exclusive: fill end" value="564d48ff"/>
     <Option name="monitor solo exclusive: fill start active" value="5d5856ff"/>
@@ -326,10 +267,6 @@
     <Option name="monitor solo exclusive: led active" value="ffa500ff"/>
     <Option name="monitor solo exclusive: text" value="c7c7d8ff"/>
     <Option name="monitor solo exclusive: text active" value="c8c8d9ff"/>
-    <Option name="rude solo: border start" value="997171ff"/>
-    <Option name="rude solo: border end" value="000000ff"/>
-    <Option name="rude solo: border start selected" value="000000ff"/>
-    <Option name="rude solo: border end selected" value="00000000"/>
     <Option name="rude solo: fill start" value="684d4dff"/>
     <Option name="rude solo: fill end" value="513c3cff"/>
     <Option name="rude solo: fill start active" value="ff1f1fff"/>
@@ -338,10 +275,6 @@
     <Option name="rude solo: led active" value="00000000"/>
     <Option name="rude solo: text" value="969696ff"/>
     <Option name="rude solo: text active" value="e5e5e5ff"/>
-    <Option name="rude isolate: border start" value="8da8b4ff"/>
-    <Option name="rude isolate: border end" value="000000ff"/>
-    <Option name="rude isolate: border start selected" value="00000000"/>
-    <Option name="rude isolate: border end selected" value="000000ff"/>
     <Option name="rude isolate: fill start" value="21414fff"/>
     <Option name="rude isolate: fill end" value="192930ff"/>
     <Option name="rude isolate: fill start active" value="e5f7ffff"/>
@@ -350,10 +283,6 @@
     <Option name="rude isolate: led active" value="000000ff"/>
     <Option name="rude isolate: text" value="979797ff"/>
     <Option name="rude isolate: text active" value="000000ff"/>
-    <Option name="rude audition: border start" value="997171ff"/>
-    <Option name="rude audition: border end" value="000000ff"/>
-    <Option name="rude audition: border start selected" value="00000000"/>
-    <Option name="rude audition: border end selected" value="000000ff"/>
     <Option name="rude audition: fill start" value="684d4dff"/>
     <Option name="rude audition: fill end" value="513c3cff"/>
     <Option name="rude audition: fill start active" value="ff1f1fff"/>
@@ -362,10 +291,6 @@
     <Option name="rude audition: led active" value="00000000"/>
     <Option name="rude audition: text" value="979797ff"/>
     <Option name="rude audition: text active" value="ffffffff"/>
-    <Option name="feedback alert: border start" value="997171ff"/>
-    <Option name="feedback alert: border end" value="000000ff"/>
-    <Option name="feedback alert: border start selected" value="000000ff"/>
-    <Option name="feedback alert: border end selected" value="00000000"/>
     <Option name="feedback alert: fill start" value="684d4dff"/>
     <Option name="feedback alert: fill end" value="513c3cff"/>
     <Option name="feedback alert: fill start active" value="ff1f1fff"/>
@@ -374,22 +299,14 @@
     <Option name="feedback alert: led active" value="00000000"/>
     <Option name="feedback alert: text" value="969696ff"/>
     <Option name="feedback alert: text active" value="e5e5e5ff"/>
-    <Option name="mute button: border start" value="ffc300ff"/>
-    <Option name="mute button: border end" value="856237ff"/>
-    <Option name="mute button: border start selected" value="00000000"/>
-    <Option name="mute button: border end selected" value="00000000"/>
-    <Option name="mute button: fill start" value="bf9a24ff"/>
-    <Option name="mute button: fill end" value="846137ff"/>
+    <Option name="mute button: fill start" value="af8a14ff"/>
+    <Option name="mute button: fill end" value="745127ff"/>
     <Option name="mute button: fill start active" value="ffc300ff"/>
     <Option name="mute button: fill end active" value="ea8400ff"/>
     <Option name="mute button: led" value="00000000"/>
     <Option name="mute button: led active" value="00000000"/>
     <Option name="mute button: text" value="bfbfbfff"/>
     <Option name="mute button: text active" value="191919ff"/>
-    <Option name="solo button: border start" value="ffffffff"/>
-    <Option name="solo button: border end" value="4c5c2bff"/>
-    <Option name="solo button: border start selected" value="000000ff"/>
-    <Option name="solo button: border end selected" value="000000ff"/>
     <Option name="solo button: fill start" value="a09865ff"/>
     <Option name="solo button: fill end" value="4c5b2aff"/>
     <Option name="solo button: fill start active" value="fffd9bff"/>
@@ -398,10 +315,6 @@
     <Option name="solo button: led active" value="00000000"/>
     <Option name="solo button: text" value="bfbfbfff"/>
     <Option name="solo button: text active" value="191919ff"/>
-    <Option name="record enable button: border start" value="a06969ff"/>
-    <Option name="record enable button: border end" value="000000ff"/>
-    <Option name="record enable button: border start selected" value="00000000"/>
-    <Option name="record enable button: border end selected" value="00000000"/>
     <Option name="record enable button: fill start" value="603f3fff"/>
     <Option name="record enable button: fill end" value="3d2828ff"/>
     <Option name="record enable button: fill start active" value="fb0c0cff"/>
@@ -410,10 +323,6 @@
     <Option name="record enable button: led active" value="00000000"/>
     <Option name="record enable button: text" value="a5a5a5ff"/>
     <Option name="record enable button: text active" value="d8d8d8ff"/>
-    <Option name="send alert button: border start" value="9baa8dff"/>
-    <Option name="send alert button: border end" value="000000ff"/>
-    <Option name="send alert button: border start selected" value="00000000"/>
-    <Option name="send alert button: border end selected" value="00000000"/>
     <Option name="send alert button: fill start" value="4e5647ff"/>
     <Option name="send alert button: fill end" value="43493cff"/>
     <Option name="send alert button: fill start active" value="91f928ff"/>
@@ -422,10 +331,6 @@
     <Option name="send alert button: led active" value="00000000"/>
     <Option name="send alert button: text" value="ccccccff"/>
     <Option name="send alert button: text active" value="000000ff"/>
-    <Option name="transport button: border start" value="9e9e9eff"/>
-    <Option name="transport button: border end" value="070707ff"/>
-    <Option name="transport button: border start selected" value="00000000"/>
-    <Option name="transport button: border end selected" value="00000000"/>
     <Option name="transport button: fill start" value="656867ff"/>
     <Option name="transport button: fill end" value="333333ff"/>
     <Option name="transport button: fill start active" value="a1ff43ff"/>
@@ -434,10 +339,6 @@
     <Option name="transport button: led active" value="00000000"/>
     <Option name="transport button: text" value="00000000"/>
     <Option name="transport button: text active" value="00000000"/>
-    <Option name="transport recenable button: border start" value="a06a6aff"/>
-    <Option name="transport recenable button: border end" value="000000ff"/>
-    <Option name="transport recenable button: border start selected" value="000000ff"/>
-    <Option name="transport recenable button: border end selected" value="000000ff"/>
     <Option name="transport recenable button: fill start" value="5f3f3fff"/>
     <Option name="transport recenable button: fill end" value="3d2828ff"/>
     <Option name="transport recenable button: fill start active" value="f80b0bff"/>
@@ -446,10 +347,6 @@
     <Option name="transport recenable button: led active" value="00000000"/>
     <Option name="transport recenable button: text" value="00000000"/>
     <Option name="transport recenable button: text active" value="00000000"/>
-    <Option name="transport option button: border start" value="9597a5ff"/>
-    <Option name="transport option button: border end" value="0f0f0fff"/>
-    <Option name="transport option button: border start selected" value="000000ff"/>
-    <Option name="transport option button: border end selected" value="282828ff"/>
     <Option name="transport option button: fill start" value="636470ff"/>
     <Option name="transport option button: fill end" value="4a4b51ff"/>
     <Option name="transport option button: fill start active" value="636470ff"/>
@@ -458,10 +355,6 @@
     <Option name="transport option button: led active" value="ffa500ff"/>
     <Option name="transport option button: text" value="c7c7d8ff"/>
     <Option name="transport option button: text active" value="c8c8d9ff"/>
-    <Option name="transport active option button: border start" value="a9b2a9ff"/>
-    <Option name="transport active option button: border end" value="0c0c0cff"/>
-    <Option name="transport active option button: border start selected" value="8a998aff"/>
-    <Option name="transport active option button: border end selected" value="596359ff"/>
     <Option name="transport active option button: fill start" value="606b60ff"/>
     <Option name="transport active option button: fill end" value="555d54ff"/>
     <Option name="transport active option button: fill start active" value="a1ff43ff"/>
@@ -470,10 +363,6 @@
     <Option name="transport active option button: led active" value="ffa500ff"/>
     <Option name="transport active option button: text" value="c7c7d8ff"/>
     <Option name="transport active option button: text active" value="000000ff"/>
-    <Option name="plugin bypass button: border start" value="b7b7d2ff"/>
-    <Option name="plugin bypass button: border end" value="000000ff"/>
-    <Option name="plugin bypass button: border start selected" value="9a908eff"/>
-    <Option name="plugin bypass button: border end selected" value="675c5bff"/>
     <Option name="plugin bypass button: fill start" value="5d5856ff"/>
     <Option name="plugin bypass button: fill end" value="564d48ff"/>
     <Option name="plugin bypass button: fill start active" value="5d5856ff"/>
@@ -482,10 +371,6 @@
     <Option name="plugin bypass button: led active" value="ff0000ff"/>
     <Option name="plugin bypass button: text" value="c7c7d8ff"/>
     <Option name="plugin bypass button: text active" value="c8c8d9ff"/>
-    <Option name="punch button: border start" value="a06969ff"/>
-    <Option name="punch button: border end" value="000000ff"/>
-    <Option name="punch button: border start selected" value="000000ff"/>
-    <Option name="punch button: border end selected" value="000000ff"/>
     <Option name="punch button: fill start" value="603f3fff"/>
     <Option name="punch button: fill end" value="3d2828ff"/>
     <Option name="punch button: fill start active" value="fb0c0cff"/>
@@ -494,10 +379,6 @@
     <Option name="punch button: led active" value="00000000"/>
     <Option name="punch button: text" value="a5a5a5ff"/>
     <Option name="punch button: text active" value="d8d8d8ff"/>
-    <Option name="mouse mode button: border start" value="b9db9aff"/>
-    <Option name="mouse mode button: border end" value="000000ff"/>
-    <Option name="mouse mode button: border start selected" value="9a908eff"/>
-    <Option name="mouse mode button: border end selected" value="675c5bff"/>
     <Option name="mouse mode button: fill start" value="6e8755ff"/>
     <Option name="mouse mode button: fill end" value="274e00ff"/>
     <Option name="mouse mode button: fill start active" value="c5ff95ff"/>
@@ -506,10 +387,6 @@
     <Option name="mouse mode button: led active" value="ffa500ff"/>
     <Option name="mouse mode button: text" value="c7c7d8ff"/>
     <Option name="mouse mode button: text active" value="000000ff"/>
-    <Option name="zoom button: border start" value="9092a3ff"/>
-    <Option name="zoom button: border end" value="0a0a0aff"/>
-    <Option name="zoom button: border start selected" value="9a908eff"/>
-    <Option name="zoom button: border end selected" value="675c5bff"/>
     <Option name="zoom button: fill start" value="626370ff"/>
     <Option name="zoom button: fill end" value="4a4b51ff"/>
     <Option name="zoom button: fill start active" value="4d4d4dff"/>
@@ -518,10 +395,6 @@
     <Option name="zoom button: led active" value="ffa500ff"/>
     <Option name="zoom button: text" value="c7c7d8ff"/>
     <Option name="zoom button: text active" value="c8c8d9ff"/>
-    <Option name="route button: border start" value="b7b7d2ff"/>
-    <Option name="route button: border end" value="000000ff"/>
-    <Option name="route button: border start selected" value="8e8e9aff"/>
-    <Option name="route button: border end selected" value="5b5b67ff"/>
     <Option name="route button: fill start" value="56565dff"/>
     <Option name="route button: fill end" value="484856ff"/>
     <Option name="route button: fill start active" value="4d4d4dff"/>
@@ -530,10 +403,6 @@
     <Option name="route button: led active" value="ffa500ff"/>
     <Option name="route button: text" value="c7c7d8ff"/>
     <Option name="route button: text active" value="c8c8d9ff"/>
-    <Option name="mixer strip button: border start" value="b7b7d2ff"/>
-    <Option name="mixer strip button: border end" value="000000ff"/>
-    <Option name="mixer strip button: border start selected" value="9a908eff"/>
-    <Option name="mixer strip button: border end selected" value="675c5bff"/>
     <Option name="mixer strip button: fill start" value="56565dff"/>
     <Option name="mixer strip button: fill end" value="484856ff"/>
     <Option name="mixer strip button: fill start active" value="ffd993ff"/>
@@ -542,10 +411,6 @@
     <Option name="mixer strip button: led active" value="ffa500ff"/>
     <Option name="mixer strip button: text" value="c7c7d7ff"/>
     <Option name="mixer strip button: text active" value="000000ff"/>
-    <Option name="mixer strip name button: border start" value="b7b7d2ff"/>
-    <Option name="mixer strip name button: border end" value="000000ff"/>
-    <Option name="mixer strip name button: border start selected" value="8e8e9aff"/>
-    <Option name="mixer strip name button: border end selected" value="5b5b67ff"/>
     <Option name="mixer strip name button: fill start" value="56565dff"/>
     <Option name="mixer strip name button: fill end" value="484856ff"/>
     <Option name="mixer strip name button: fill start active" value="4d4d4dff"/>
@@ -554,10 +419,6 @@
     <Option name="mixer strip name button: led active" value="ffa500ff"/>
     <Option name="mixer strip name button: text" value="c7c7d8ff"/>
     <Option name="mixer strip name button: text active" value="c8c8d9ff"/>
-    <Option name="midi input button: border start" value="9e9e9eff"/>
-    <Option name="midi input button: border end" value="070707ff"/>
-    <Option name="midi input button: border start selected" value="00000000"/>
-    <Option name="midi input button: border end selected" value="00000000"/>
     <Option name="midi input button: fill start" value="656867ff"/>
     <Option name="midi input button: fill end" value="333333ff"/>
     <Option name="midi input button: fill start active" value="a1ff43ff"/>
@@ -566,22 +427,22 @@
     <Option name="midi input button: led active" value="00000000"/>
     <Option name="midi input button: text" value="00000000"/>
     <Option name="midi input button: text active" value="00000000"/>
-    <Option name="transport clock: background" value="000000ff"/>
-    <Option name="transport clock: text" value="6bb620ff"/>
+    <Option name="transport clock: background" value="262626ff"/>
+    <Option name="transport clock: text" value="8df823ff"/>
     <Option name="transport clock: edited text" value="ffa500ff"/>
     <Option name="transport clock: cursor" value="ffa500ff"/>
-    <Option name="secondary clock: background" value="000000ff"/>
-    <Option name="secondary clock: text" value="6bb620ff"/>
+    <Option name="secondary clock: background" value="262626ff"/>
+    <Option name="secondary clock: text" value="8df823ff"/>
     <Option name="secondary clock: edited text" value="ffa500ff"/>
     <Option name="secondary clock: cursor" value="ffa500ff"/>
     <Option name="transport delta clock: background" value="000000ff"/>
-    <Option name="transport delta clock: text" value="0009f3ff"/>
     <Option name="transport delta clock: edited text" value="ff0000ff"/>
     <Option name="transport delta clock: cursor" value="f11000ff"/>
-    <Option name="secondary delta clock: background" value="000000ff"/>
-    <Option name="secondary delta clock: text" value="0009f3ff"/>
+    <Option name="transport delta clock: text" value="8ce1f8ff"/>
     <Option name="secondary delta clock: edited text" value="ff0000ff"/>
     <Option name="secondary delta clock: cursor" value="f11000ff"/>
+    <Option name="secondary delta clock: background" value="000000ff"/>
+    <Option name="secondary delta clock: text" value="8ce1f8ff"/>
     <Option name="big clock: background" value="020202ff"/>
     <Option name="big clock: text" value="f0f0f0ff"/>
     <Option name="big clock: edited text" value="ffa500ff"/>
@@ -598,7 +459,7 @@
     <Option name="selection clock: text" value="6bb620ff"/>
     <Option name="selection clock: edited text" value="ff0000ff"/>
     <Option name="selection clock: cursor" value="f11000ff"/>
-    <Option name="nudge clock: background" value="000000ff"/>
+    <Option name="nudge clock: background" value="262626ff"/>
     <Option name="nudge clock: text" value="6bb620ff"/>
     <Option name="nudge clock: edited text" value="ffa500ff"/>
     <Option name="nudge clock: cursor" value="ffa500ff"/>
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index 907ef38f5d..5b83be9483 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -351,6 +351,16 @@ style "inspector_processor_list" = "processor_list"
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
+style "time_info_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
+style "status_bar_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
 ##include ardour3_light_fonts.rc
 ##include ardour3_light_styles.rc
 ##include ardour3_widgets.rc
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 2d4ed27530..14d72ff233 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -119,16 +119,16 @@ widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
 widget "*WarningMessage" style:highest "warning_message"
 
-widget "*big clock" style:highest "massive_text"
+widget "*big clock" style:highest "monospace massive_text"
 widget "*selection clock" style:highest "small_text"
-widget "*punch clock" style:highest "small_text"
-widget "*transport clock" style:highest "large_bold_text"
-widget "*secondary clock" style:highest "large_bold_text"
-widget "*transport delta clock" style:highest "large_bold_text"
-widget "*secondary delta clock" style:highest "large_bold_text"
+widget "*punch clock" style:highest "small_mono_text"
+widget "*transport clock" style:highest "large_bold_mono_text"
+widget "*secondary clock" style:highest "large_bold_mono_text"
+widget "*transport delta clock" style:highest "large_bold_mono_text"
+widget "*secondary delta clock" style:highest "large_bold_mono_text"
 widget "*silence duration clock" style:highest "medium_text"
 widget "*edit point clock" style:highest "medium_text"
-widget "*nudge clock" style:highest "medium_bold_text"
+widget "*nudge clock" style:highest "small_mono_text"
 widget "*menubar clock" style:highest "medium_text"
 widget "*zoomrange clock" style:highest "medium_text"
 widget "*timecodeoffset clock" style:highest "medium_text"
@@ -348,6 +348,8 @@ widget "*TimeInfoSelectionTitle" style:highest "very_small_text"
 widget "*TimeInfoSelectionLabel" style:highest "very_small_text"
 widget "*TimeInfoPunchTitle" style:highest "very_small_text"
 widget "*TimeInfoPunchButton" style:highest "very_small_text"
+widget "*TimeInfoBox" style:highest "time_info_box"
+widget "*StatusBarBox" style:highest "status_bar_box"
 widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
 widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
 widget "*EditorRouteGroupsAllGroupButton" style:highest "default_toggle_button"
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 3e97099703..303e52de64 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -59,9 +59,12 @@ ArdourButton::ArdourButton (Element e)
 	, _diameter (11.0)
 	, _corner_radius (5.0)
 	, _corner_mask (0xf)
-	, edge_pattern (0)
-	, active_pattern (0)
-	, inactive_pattern (0)
+	, border_color (0)
+	, fill_color_active (0)
+	, fill_color_inactive (0)
+	, fill_pattern (0)
+	, fill_pattern_active (0)
+	, shine_pattern (0)
 	, led_inset_pattern (0)
 	, reflection_pattern (0)
 	, _led_rect (0)
@@ -80,11 +83,14 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (11.0)
-	, _corner_radius (9.0)
+	, _corner_radius (5.0)
 	, _corner_mask (0xf)
-	, edge_pattern (0)
-	, active_pattern (0)
-	, inactive_pattern (0)
+	, border_color (0)
+	, fill_color_active (0)
+	, fill_color_inactive (0)
+	, fill_pattern (0)
+	, fill_pattern_active (0)
+	, shine_pattern (0)
 	, led_inset_pattern (0)
 	, reflection_pattern (0)
 	, _led_rect (0)
@@ -101,17 +107,26 @@ ArdourButton::~ArdourButton()
 {
 	delete _led_rect;
 
-	if (edge_pattern) {
-		cairo_pattern_destroy (edge_pattern);
+	if (shine_pattern) {
+		cairo_pattern_destroy (shine_pattern);
 	}
 
-	if (active_pattern) {
-		cairo_pattern_destroy (active_pattern);
+	if (fill_pattern) {
+		cairo_pattern_destroy (fill_pattern);
+	}
+	
+	if (fill_pattern_active) {
+		cairo_pattern_destroy (fill_pattern_active);
+	}
+	
+	if (led_inset_pattern) {
+		cairo_pattern_destroy (led_inset_pattern);
+	}
+	
+	if (reflection_pattern) {
+		cairo_pattern_destroy (reflection_pattern);
 	}
 
-	if (inactive_pattern) {
-		cairo_pattern_destroy (inactive_pattern);
-	}
 }
 
 void
@@ -169,9 +184,13 @@ ArdourButton::render (cairo_t* cr)
 		_diameter = std::min (get_width(), get_height());
 	}
 
+	float r,g,b,a;
+
 	if (_elements & Edge) {
 		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
-		cairo_set_source (cr, edge_pattern);
+		UINT_TO_RGBA (border_color, &r, &g, &b, &a);
+		//cairo_set_source_rgba (cr, r/255.0,g/255.0,b/255.0,a/255.0);  //TODO:  why doesn't this work?
+		cairo_set_source_rgba (cr, 0,0,0,0.9);
 		cairo_fill (cr);
 	}
 
@@ -179,21 +198,51 @@ ArdourButton::render (cairo_t* cr)
 		if (_elements & Edge) {
 			rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1.0);
 		} else {
-			rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius - 1.0);
+			rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
 		}
 
 		if (active_state() == Gtkmm2ext::ImplicitActive) {
-			cairo_set_source (cr, inactive_pattern);
+			//background color
+			cairo_set_source (cr, fill_pattern);
 			cairo_fill_preserve (cr);
+
+			//border
+			UINT_TO_RGBA (fill_color_active, &r, &g, &b, &a);
 			cairo_set_line_width (cr, 2.0);
-			cairo_set_source (cr, active_pattern);
+//			rounded_function (cr, 3, 3, get_width()-6, get_height()-6, _corner_radius - 1.0);
+			cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
 			cairo_stroke (cr);
+
+			//reflection
+			if (!_flat_buttons) {
+				rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+				cairo_set_source (cr, shine_pattern);
+				cairo_fill (cr);
+			}
 		} else if (active_state() == Gtkmm2ext::ExplicitActive) {
-			cairo_set_source (cr, active_pattern);
+
+			//background color
+			cairo_set_source (cr, fill_pattern_active);
 			cairo_fill (cr);
+
+			//reflection
+			if (!_flat_buttons) {
+				rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+				cairo_set_source (cr, shine_pattern);
+				cairo_fill (cr);
+			}
 		} else {
-			cairo_set_source (cr, inactive_pattern);
+
+			//background color
+			cairo_set_source (cr, fill_pattern);
 			cairo_fill (cr);
+
+			//reflection
+			if (!_flat_buttons) {
+				rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
+				cairo_set_source (cr, shine_pattern);
+				cairo_fill (cr);
+			}		
 		}
 	}
 
@@ -213,7 +262,7 @@ ArdourButton::render (cairo_t* cr)
 	int text_margin;
 
 	if (get_width() < 75) {
-		text_margin = 3;
+		text_margin = 5;
 	} else {
 		text_margin = 10;
 	}
@@ -373,54 +422,34 @@ ArdourButton::set_colors ()
 	 * color/pattern used there will vary depending on that
 	 */
 	
-	if (edge_pattern) {
-		cairo_pattern_destroy (edge_pattern);
-		edge_pattern = 0;
+	fill_color_active = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+	fill_color_inactive = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+	border_color = ARDOUR_UI::config()->color_by_name ( "button border" );
+
+	if (shine_pattern) {
+		cairo_pattern_destroy (shine_pattern);
+		shine_pattern = 0;
 	}
 
-	if (_elements & Edge) {
-
-		edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
-		if (visual_state() & Gtkmm2ext::Selected) {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name()));
-			if (_flat_buttons) {
-				end_color = start_color;
-			} else {
-				end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name()));
-			}
-		} else {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start", get_name()));
-			if (_flat_buttons) {
-				end_color = start_color;
-			} else {
-				end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name()));
-			}
-		}
-		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7);
-		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (edge_pattern, 1, r/255.0,g/255.0,b/255.0, 0.7);
+	if (fill_pattern) {
+		cairo_pattern_destroy (fill_pattern);
+		fill_pattern = 0;
 	}
 
-	if (active_pattern) {
-		cairo_pattern_destroy (active_pattern);
-		active_pattern = 0;
-	}
-
-	if (inactive_pattern) {
-		cairo_pattern_destroy (inactive_pattern);
-		inactive_pattern = 0;
+	if (fill_pattern_active) {
+		cairo_pattern_destroy (fill_pattern_active);
+		fill_pattern_active = 0;
 	}
 
 	if (_elements & Body) {
 
-		active_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
+		shine_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()/2-2);
 		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
 
 		if (_flat_buttons) {
 			end_color = start_color;
 		} else {
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+			end_color = fill_color_active;
 		}
 		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
 
@@ -429,21 +458,33 @@ ArdourButton::set_colors ()
 		active_b = b/255.0;
 		active_a = a/255.0;
 
-		cairo_pattern_add_color_stop_rgba (active_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
-		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (active_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 0, 1,1,1,0.1);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 0.2, 1,1,1,0.4);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 1, 1,1,1,0.1);
 
-		inactive_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
+		fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
 		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
 		if (_flat_buttons) {
 			end_color = start_color;
 		} else {
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+			end_color = fill_color_inactive;
 		}
 		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (inactive_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
+		cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
 		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (inactive_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+		cairo_pattern_add_color_stop_rgba (fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+
+		fill_pattern_active = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
+		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
+		if (_flat_buttons) {
+			end_color = start_color;
+		} else {
+			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+		}
+		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
+		cairo_pattern_add_color_stop_rgba (fill_pattern_active, 0, r/255.0,g/255.0,b/255.0, a/255.0);
+		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
+		cairo_pattern_add_color_stop_rgba (fill_pattern_active, 1, r/255.0,g/255.0,b/255.0, a/255.0);
 	}
 
 	if (led_inset_pattern) {
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 94b3c6d399..016d80686c 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -116,9 +116,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	float _corner_radius;
 	int   _corner_mask;
 
-	cairo_pattern_t* edge_pattern;
-	cairo_pattern_t* active_pattern;
-	cairo_pattern_t* inactive_pattern;
+	uint32_t border_color;
+	uint32_t fill_color_active;
+	uint32_t fill_color_inactive;
+	cairo_pattern_t* fill_pattern;
+	cairo_pattern_t* fill_pattern_active;
+	cairo_pattern_t* shine_pattern;
 	cairo_pattern_t* led_inset_pattern;
 	cairo_pattern_t* reflection_pattern;
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 5b538bf411..a278cfa020 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -152,7 +152,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	, rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
 
 	, auto_return_button (ArdourButton::led_default_elements)
-	, auto_play_button (ArdourButton::led_default_elements)
+	, follow_edits_button (ArdourButton::led_default_elements)
 	, auto_input_button (ArdourButton::led_default_elements)
 
 	, auditioning_alert_button (_("audition"))
@@ -205,9 +205,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	original_big_clock_height = -1;
 	original_big_clock_font_size = 0;
 
-	roll_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
-	play_selection_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
-	
 	roll_button.set_controllable (roll_controllable);
 	stop_button.set_controllable (stop_controllable);
 	goto_start_button.set_controllable (goto_start_controllable);
@@ -402,7 +399,7 @@ ARDOUR_UI::post_engine ()
 		vector<string>::iterator n;
 		vector<string>::iterator k;
 		for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) {
-			cerr << "Action: " << (*n) << " bound to " << (*k) << endl;
+			cout << "Action: " << (*n) << " bound to " << (*k) << endl;
 		}
 
 		exit (0);
@@ -1086,8 +1083,9 @@ ARDOUR_UI::update_timecode_format ()
 	if (_session) {
 		bool matching;
 		TimecodeSlave* tcslave;
+		SyncSource sync_src = Config->get_sync_source();
 
-		if ((tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
+		if ((sync_src == LTC || sync_src == MTC) && (tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
 			matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
 		} else {
 			matching = true;
@@ -1633,15 +1631,18 @@ ARDOUR_UI::transport_roll ()
 		_session->request_play_range (0, true);
 	}
 
-	if (Config->get_always_play_range()) {
-		_session->request_play_range (&editor->get_selection().time, true);
-	}
-
 	if (!rolling) {
 		_session->request_transport_speed (1.0f);
 	}
 }
 
+bool
+ARDOUR_UI::get_smart_mode() const
+{
+	return ( editor->get_smart_mode() );
+}
+
+
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
@@ -1692,7 +1693,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 		if (rolling) {
 			_session->request_stop (with_abort, true);
 		} else {
-			if (Config->get_always_play_range ()) {
+			if ( Config->get_always_play_range() ) {
 				_session->request_play_range (&editor->get_selection().time, true);
 			}
 
@@ -1738,6 +1739,15 @@ ARDOUR_UI::transport_play_selection ()
 	editor->play_selection ();
 }
 
+void
+ARDOUR_UI::transport_play_preroll ()
+{
+	if (!_session) {
+		return;
+	}
+	editor->play_with_preroll ();
+}
+
 void
 ARDOUR_UI::transport_rewind (int option)
 {
@@ -2955,23 +2965,23 @@ require some unused files to continue to exist."));
 	double space_adjusted = 0;
 
 	if (rep.space < 1000) {
-		bprefix = X_("");
+		bprefix = _("");
 		space_adjusted = rep.space;
 	} else if (rep.space < 1000000) {
-		bprefix = X_("kilo");
+		bprefix = _("kilo");
 		space_adjusted = truncf((float)rep.space / 1000.0);
 	} else if (rep.space < 1000000 * 1000) {
-		bprefix = X_("mega");
+		bprefix = _("mega");
 		space_adjusted = truncf((float)rep.space / (1000.0 * 1000.0));
 	} else {
-		bprefix = X_("giga");
+		bprefix = _("giga");
 		space_adjusted = truncf((float)rep.space / (1000.0 * 1000 * 1000.0));
 	}
 
 	if (removed > 1) {
-		txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
+		txt.set_markup (string_compose (plural_msg, removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
 	} else {
-		txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
+		txt.set_markup (string_compose (singular_msg, removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
 	}
 
 	dhbox.pack_start (*dimage, true, false, 5);
@@ -3069,20 +3079,16 @@ Clean-up will move all unused files to a \"dead\" location."));
 				 _("Cleaned Files"),
 				 _("\
 The following %1 files were not in use and \n\
-have been moved to:\n\n\
-%2\n\n\
-After a restart of %5,\n\n\
-Session -> Clean-up -> Flush Wastebasket\n\n\
-will release an additional\n\
-%3 %4bytes of disk space.\n"),
+have been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n"),
 				 _("\
 The following file was not in use and \n\
-has been moved to:\n				\
-%2\n\n\
-After a restart of %5,\n\n\
-Session -> Clean-up -> Flush Wastebasket\n\n\
-will release an additional\n\
-%3 %4bytes of disk space.\n"
+has been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n"
 					 ));
 
 }
@@ -3103,11 +3109,9 @@ ARDOUR_UI::flush_trash ()
 
 	display_cleanup_results (rep,
 				 _("deleted file"),
-				 _("The following %1 files were deleted from\n\
-%2,\n\
+				 _("The following %1 files were deleted from %2,\n\
 releasing %3 %4bytes of disk space"),
-				 _("The following file was deleted from\n\
-%2,\n\
+				 _("The following file was deleted from %2,\n\
 releasing %3 %4bytes of disk space"));
 }
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 1c95232479..0af4cd6d2a 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -140,6 +140,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	ARDOUR::Session* the_session() { return _session; }
 
+	bool get_smart_mode () const;
+	
 	int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
 	int  build_session_from_nsd (const std::string& session_name, const std::string& session_path);
 	bool ask_about_loading_existing_session (const std::string& session_path);
@@ -418,8 +420,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	ArdourButton play_selection_button;
 	ArdourButton rec_button;
 
-	ButtonJoiner* transport_joiner;
-
 	void toggle_external_sync ();
 	void toggle_time_master ();
 	void toggle_video_sync ();
@@ -427,7 +427,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	ShuttleControl* shuttle_box;
 
 	ArdourButton auto_return_button;
-	ArdourButton auto_play_button;
+	ArdourButton follow_edits_button;
 	ArdourButton auto_input_button;
 	ArdourButton click_button;
 	ArdourButton sync_button;
@@ -446,7 +446,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void soloing_changed (bool);
 	void auditioning_changed (bool);
 	void _auditioning_changed (bool);
-
+	
 	bool solo_alert_press (GdkEventButton* ev);
 	bool audition_alert_press (GdkEventButton* ev);
 	bool feedback_alert_press (GdkEventButton *);
@@ -546,6 +546,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void transport_record (bool roll);
 	void transport_roll ();
 	void transport_play_selection();
+	void transport_play_preroll(); 
 	void transport_forward (int option);
 	void transport_rewind (int option);
 	void transport_loop ();
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 97a9103c4e..f3068539e8 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -46,7 +46,6 @@
 #include "public_editor.h"
 #include "audio_clock.h"
 #include "actions.h"
-#include "button_joiner.h"
 #include "main_clock.h"
 #include "utils.h"
 #include "theme_manager.h"
@@ -133,16 +132,15 @@ ARDOUR_UI::setup_tooltips ()
 	set_tip (goto_end_button, _("Go to end of session"));
 	set_tip (auto_loop_button, _("Play loop range"));
 	set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
-	set_tip (*transport_joiner, _("Always Play Range Selection (if any)"));
 	set_tip (auto_return_button, _("Return to last playback start when stopped"));
-	set_tip (auto_play_button, _("Start playback after any locate"));
+	set_tip (follow_edits_button, _("Playhead follows Range Selections and Edits"));
 	set_tip (auto_input_button, _("Be sensible about input monitoring"));
 	set_tip (click_button, _("Enable/Disable audio click"));
 	set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
 	set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
 	set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
-	set_tip (primary_clock, _("Primary Clock"));
-	set_tip (secondary_clock, _("Secondary Clock"));
+	set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
+	set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
 
 	synchronize_sync_source_and_video_pullup ();
 
@@ -243,7 +241,7 @@ ARDOUR_UI::setup_transport ()
 						  static_cast<Widget*> (&transport_frame), 1));
 
 	auto_return_button.set_text(_("Auto Return"));
-	auto_play_button.set_text(_("Auto Play"));
+	follow_edits_button.set_text(_("Follow Edits"));
 	auto_input_button.set_text (_("Auto Input"));
 
 	click_button.set_image (get_icon (X_("metronome")));
@@ -252,12 +250,12 @@ ARDOUR_UI::setup_transport ()
 	click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
 
 	auto_return_button.set_name ("transport option button");
-	auto_play_button.set_name ("transport option button");
+	follow_edits_button.set_name ("transport option button");
 	auto_input_button.set_name ("transport option button");
 
 	/* these have to provide a clear indication of active state */
 
-	click_button.set_name ("transport active option button");
+	click_button.set_name ("transport button");
 	sync_button.set_name ("transport active option button");
 
 	stop_button.set_active (true);
@@ -293,11 +291,6 @@ ARDOUR_UI::setup_transport ()
 	act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
 	sync_button.set_related_action (act);
 
-	transport_joiner = manage (new ButtonJoiner ("transport button", play_selection_button, roll_button));
-
-	act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange"));
-	transport_joiner->set_related_action (act);
-
 	/* clocks, etc. */
 
 	ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set));
@@ -309,8 +302,8 @@ ARDOUR_UI::setup_transport ()
 
 	act = ActionManager::get_action ("Transport", "ToggleAutoReturn");
 	auto_return_button.set_related_action (act);
-	act = ActionManager::get_action ("Transport", "ToggleAutoPlay");
-	auto_play_button.set_related_action (act);
+	act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
+	follow_edits_button.set_related_action (act);
 	act = ActionManager::get_action ("Transport", "ToggleAutoInput");
 	auto_input_button.set_related_action (act);
 
@@ -344,22 +337,19 @@ ARDOUR_UI::setup_transport ()
 
 	HBox* tbox1 = manage (new HBox);
 	HBox* tbox2 = manage (new HBox);
-	HBox* tbox3 = manage (new HBox);
 	HBox* tbox = manage (new HBox);
 
 	VBox* vbox1 = manage (new VBox);
 	VBox* vbox2 = manage (new VBox);
-	VBox* vbox3 = manage (new VBox);
 
 	Alignment* a1 = manage (new Alignment);
 	Alignment* a2 = manage (new Alignment);
-	Alignment* a3 = manage (new Alignment);
 
 	tbox1->set_spacing (2);
 	tbox2->set_spacing (2);
-	tbox3->set_spacing (2);
 	tbox->set_spacing (2);
 
+	tbox1->pack_start (click_button, false, false, 5);
 	tbox1->pack_start (midi_panic_button, false, false);
 	tbox1->pack_start (goto_start_button, false, false);
 	tbox1->pack_start (goto_end_button, false, false);
@@ -368,34 +358,29 @@ ARDOUR_UI::setup_transport ()
 	play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */
 	roll_button.set_rounded_corner_mask (0x2); /* upper right only */
 
-	tbox2->pack_start (*transport_joiner, false, false);
-
-	tbox3->pack_start (stop_button, false, false);
-	tbox3->pack_start (rec_button, false, false, 6);
+	tbox2->pack_start (play_selection_button, false, false);
+	tbox2->pack_start (roll_button, false, false);
+	tbox2->pack_start (stop_button, false, false);
+	tbox2->pack_start (rec_button, false, false, 5);
 
 	vbox1->pack_start (*tbox1, false, false);
 	vbox2->pack_start (*tbox2, false, false);
-	vbox3->pack_start (*tbox3, false, false);
 
 	a1->add (*vbox1);
 	a1->set (0.5, 1.0, 0.0, 0.0);
 	a2->add (*vbox2);
 	a2->set (0.5, 1.0, 0.0, 0.0);
-	a3->add (*vbox3);
-	a3->set (0.5, 1.0, 0.0, 0.0);
 
 	tbox->pack_start (*a1, false, false);
 	tbox->pack_start (*a2, false, false);
-	tbox->pack_start (*a3, false, false);
 
 	HBox* clock_box = manage (new HBox);
 
-	primary_clock->set_border_width (2);
 	clock_box->pack_start (*primary_clock, false, false);
 	if (!ARDOUR::Profile->get_small_screen()) {
-		secondary_clock->set_border_width (2);
 		clock_box->pack_start (*secondary_clock, false, false);
 	}
+	clock_box->set_spacing (3);
 
 	shuttle_box = new ShuttleControl;
 	shuttle_box->show ();
@@ -415,12 +400,11 @@ ARDOUR_UI::setup_transport ()
 	auto_box->set_homogeneous (true);
 	auto_box->set_spacing (2);
 	auto_box->pack_start (sync_button, false, false);
-	auto_box->pack_start (auto_play_button, false, false);
+	auto_box->pack_start (follow_edits_button, false, false);
 	auto_box->pack_start (auto_return_button, false, false);
 
 	transport_tearoff_hbox.pack_start (*auto_box, false, false);
-	transport_tearoff_hbox.pack_start (*clock_box, false, false);
-	transport_tearoff_hbox.pack_start (click_button, false, false);
+	transport_tearoff_hbox.pack_start (*clock_box, true, true);
 
 	time_info_box = manage (new TimeInfoBox);
 	transport_tearoff_hbox.pack_start (*time_info_box, false, false);
@@ -649,7 +633,7 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
 void
 ARDOUR_UI::toggle_always_play_range ()
 {
-	RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange"));
+	RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
 	assert (act);
 
 	RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 0ac3516d85..662ab44bfa 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -287,10 +287,6 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_toggle_action (transport_actions, X_("AlwaysPlayRange"), _("Always Play Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_always_play_range));
-	ActionManager::session_sensitive_actions.push_back (act);
-	ActionManager::transport_sensitive_actions.push_back (act);
-
 	act = ActionManager::register_action (transport_actions, X_("ToggleRoll"), _("Start/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, false));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
@@ -321,6 +317,9 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selected Range"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
+	act = ActionManager::register_action (transport_actions, X_("PlayPreroll"), _("Play Selection w/Preroll"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_preroll));
+	ActionManager::session_sensitive_actions.push_back (act);
+	ActionManager::transport_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_action (transport_actions, X_("Record"), _("Enable Record"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::transport_record), false));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -406,6 +405,10 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoReturn"), _("Auto Return"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_auto_return));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
+	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleFollowEdits"), _("Follow Edits"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_always_play_range));
+	ActionManager::session_sensitive_actions.push_back (act);
+	ActionManager::transport_sensitive_actions.push_back (act);
+
 
 	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleVideoSync"), _("Sync Startup to Video"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_video_sync));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -538,6 +541,7 @@ ARDOUR_UI::build_menu_bar ()
 	EventBox* ev = manage (new EventBox);
 	ev->show ();
 	CairoHPacker* hbox = manage (new CairoHPacker);
+	hbox->set_name (X_("StatusBarBox"));
 	hbox->show ();
 	hbox->set_border_width (3);
 
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 5da10c7ea3..29c71a61a8 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -69,6 +69,17 @@ when the pull up/down setting is non-zero."));
 			}
 		}
 
+		/* activating a slave is a session-property.
+		 * The slave type is a RC property.
+		 * When the slave is active is must not be reconfigured.
+		 * This is a UI limitation, imposed by audio-clock and
+		 * status displays which combine RC-config & session-properties.
+		 *
+		 * Notficy RCOptionEditor by emitting a signal if the active
+		 * status changed:
+		 */
+		Config->ParameterChanged("sync-source");
+
 		ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
 	}
 }
@@ -310,16 +321,18 @@ ARDOUR_UI::parameter_changed (std::string p)
 			sync_button.set_text (_("Internal"));
 			ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
 			ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
+			ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
 		} else {
 			sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true));
 			/* XXX need to make auto-play is off as well as insensitive */
 			ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
 			ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+			ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
 		}
 
 	} else if (p == "always-play-range") {
 
-		ActionManager::map_some_state ("Transport", "AlwaysPlayRange", &RCConfiguration::get_always_play_range);
+		ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_always_play_range);
 
 	} else if (p == "send-mtc") {
 
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 5e3ff631f7..0d34e2fe25 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -53,12 +53,13 @@ using Gtkmm2ext::Keyboard;
 
 sigc::signal<void> AudioClock::ModeChanged;
 vector<AudioClock*> AudioClock::clocks;
-const double AudioClock::info_font_scale_factor = 0.6;
-const double AudioClock::separator_height = 2.0;
+const double AudioClock::info_font_scale_factor = 0.5;
+const double AudioClock::separator_height = 0.0;
 const double AudioClock::x_leading_padding = 6.0;
 
 #define BBT_BAR_CHAR "|"
 #define BBT_SCANF_FORMAT "%" PRIu32 "%*c%" PRIu32 "%*c%" PRIu32
+#define INFO_FONT_SIZE ((int)round(font_size * info_font_scale_factor))
 
 AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name,
 			bool allow_edit, bool follows_playhead, bool duration, bool with_info)
@@ -73,6 +74,8 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
 	, layout_x_offset (0)
 	, em_width (0)
 	, _edit_by_click_field (false)
+	, _negative_allowed (false)
+	, edit_is_negative (false)
 	, editing_attr (0)
 	, foreground_attr (0)
 	, first_height (0)
@@ -83,6 +86,7 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string&
 	, upper_height (0)
 	, mode_based_info_ratio (1.0)
 	, corner_radius (9)
+	, font_size (10240)
 	, editing (false)
 	, bbt_reference_time (-1)
 	, last_when(0)
@@ -149,9 +153,8 @@ void
 AudioClock::set_font ()
 {
 	Glib::RefPtr<Gtk::Style> style = get_style ();
-	Pango::FontDescription font; 
+	Pango::FontDescription font;
 	Pango::AttrFontDesc* font_attr;
-	uint32_t font_size;
 
 	if (!is_realized()) {
 		font = get_font_for_style (get_name());
@@ -162,7 +165,7 @@ AudioClock::set_font ()
 	font_size = font.get_size();
 
 	font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
-	
+
 	normal_attributes.change (*font_attr);
 	editing_attributes.change (*font_attr);
 
@@ -172,18 +175,11 @@ AudioClock::set_font ()
 	font.set_size ((int) lrint (font_size * info_font_scale_factor));
 	font.set_weight (Pango::WEIGHT_NORMAL);
 	font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
- 
+
 	info_attributes.change (*font_attr);
 
 	/* and an even smaller one */
 
-	delete font_attr;
-	font.set_size ((int) lrint (font_size * info_font_scale_factor * 0.75));
-	font.set_weight (Pango::WEIGHT_BOLD);
-	font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
- 
-	small_info_attributes.change (*font_attr);
-	
 	delete font_attr;
 
 	/* get the figure width for the font. This doesn't have to super
@@ -196,6 +192,9 @@ AudioClock::set_font ()
 
 	tmp->set_text ("8");
 	tmp->get_pixel_size (em_width, ignore_height);
+
+	/* force redraw of markup with new font-size */
+	set (last_when, true);
 }
 
 void
@@ -260,10 +259,9 @@ AudioClock::set_colors ()
 	g = lrint ((g/255.0) * 65535.0);
 	b = lrint ((b/255.0) * 65535.0);
 	editing_attr = new Pango::AttrColor (Pango::Attribute::create_attr_foreground (r, g, b));
-	
+
 	normal_attributes.change (*foreground_attr);
 	info_attributes.change (*foreground_attr);
-	small_info_attributes.change (*foreground_attr);
 	editing_attributes.change (*foreground_attr);
 	editing_attributes.change (*editing_attr);
 
@@ -273,16 +271,6 @@ AudioClock::set_colors ()
 		_layout->set_attributes (editing_attributes);
 	}
 
-	if (_left_layout) {
-		if (_mode == Timecode) {
-			_left_layout->set_attributes (small_info_attributes);
-			_right_layout->set_attributes (small_info_attributes);
-		} else {
-			_left_layout->set_attributes (info_attributes);
-			_right_layout->set_attributes (info_attributes);
-		}
-	}
-
 	queue_draw ();
 }
 
@@ -290,11 +278,15 @@ void
 AudioClock::render (cairo_t* cr)
 {
 	/* main layout: rounded rect, plus the text */
-	
+
 	if (_need_bg) {
 		cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
 		if (corner_radius) {
-			Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
+			if (_left_layout) {
+				Gtkmm2ext::rounded_top_half_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
+			} else {
+				Gtkmm2ext::rounded_rectangle (cr, 0, 0, get_width(), upper_height, corner_radius);
+			}
 		} else {
 			cairo_rectangle (cr, 0, 0, get_width(), upper_height);
 		}
@@ -304,7 +296,8 @@ AudioClock::render (cairo_t* cr)
 	if (!_fixed_width) {
 		cairo_move_to (cr, layout_x_offset, 0);
 	} else {
-		cairo_move_to (cr, layout_x_offset, (upper_height - layout_height) / 2.0);
+		int xcenter = layout_x_offset > 0 ? 0 : (get_width() - _mode_width[_mode]) /2;
+		cairo_move_to (cr, layout_x_offset + xcenter, (upper_height - layout_height) / 2.0);
 	}
 
 	pango_cairo_show_layout (cr, _layout->gobj());
@@ -323,7 +316,9 @@ AudioClock::render (cairo_t* cr)
 
 			if (_need_bg) {
 				if (corner_radius) {
-					Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h, corner_radius);
+					Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height,
+							left_rect_width + (separator_height == 0 ? corner_radius : 0),
+							h, corner_radius);
 				} else {
 					cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h);
 				}
@@ -332,17 +327,18 @@ AudioClock::render (cairo_t* cr)
 
 			cairo_move_to (cr, x_leading_padding, upper_height + separator_height + ((h - info_height)/2.0));
 			pango_cairo_show_layout (cr, _left_layout->gobj());
-			
+
 			if (_need_bg) {
 				if (corner_radius) {
-					Gtkmm2ext::rounded_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, 
-								      get_width() - separator_height - left_rect_width, h, 
-								      corner_radius);
+					Gtkmm2ext::rounded_bottom_half_rectangle (cr, left_rect_width + separator_height,
+							upper_height + separator_height,
+							get_width() - separator_height - left_rect_width,
+							h, corner_radius);
 				} else {
-					cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, 
+					cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height,
 							 get_width() - separator_height - left_rect_width, h);
 				}
-				cairo_fill (cr);	
+				cairo_fill (cr);
 			}
 
 
@@ -356,8 +352,9 @@ AudioClock::render (cairo_t* cr)
 				 */
 				int x, rw, rh;
 				_right_layout->get_pixel_size(rw, rh);
-				x = get_width() - rw- separator_height - x_leading_padding;
+				x = get_width() - rw - separator_height - x_leading_padding;
 				if (x < x_leading_padding + left_rect_width + separator_height) {
+					/* rather cut off the right end than overlap with the text on the left */
 					x = x_leading_padding + left_rect_width + separator_height;
 				}
 				cairo_move_to (cr, x, upper_height + separator_height + ((h - info_height)/2.0));
@@ -371,7 +368,7 @@ AudioClock::render (cairo_t* cr)
 
 			if (_need_bg) {
 				if (corner_radius) {
-					Gtkmm2ext::rounded_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius);
+					Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius);
 				} else {
 					cairo_rectangle (cr, 0, upper_height + separator_height, get_width(), h);
 				}
@@ -383,10 +380,11 @@ AudioClock::render (cairo_t* cr)
 	if (editing) {
 		if (!insert_map.empty()) {
 
+			int xcenter = layout_x_offset > 0 ? 0 : (get_width() - _mode_width[_mode]) /2;
 
 			if (input_string.length() < insert_map.size()) {
 				Pango::Rectangle cursor;
-				
+
 				if (input_string.empty()) {
 					/* nothing entered yet, put cursor at the end
 					   of string
@@ -395,21 +393,21 @@ AudioClock::render (cairo_t* cr)
 				} else {
 					cursor = _layout->get_cursor_strong_pos (insert_map[input_string.length()]);
 				}
-				
+
 				cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
 				if (!_fixed_width) {
-					cairo_rectangle (cr, 
-							 min (get_width() - 2.0, 
-							      (double) cursor.get_x()/PANGO_SCALE + layout_x_offset + em_width), 0,
+					cairo_rectangle (cr,
+							 min (get_width() - 2.0,
+							      (double) cursor.get_x()/PANGO_SCALE + layout_x_offset + xcenter + em_width), 0,
 							 2.0, cursor.get_height()/PANGO_SCALE);
 				} else {
-					cairo_rectangle (cr, 
-							 min (get_width() - 2.0, 
-							      (double) layout_x_offset + cursor.get_x()/PANGO_SCALE + em_width),
-							 (upper_height - layout_height)/2.0, 
+					cairo_rectangle (cr,
+							 min (get_width() - 2.0,
+							      (double) layout_x_offset + xcenter + cursor.get_x()/PANGO_SCALE + em_width),
+							 (upper_height - layout_height)/2.0,
 							 2.0, cursor.get_height()/PANGO_SCALE);
 				}
-				cairo_fill (cr);	
+				cairo_fill (cr);
 			} else {
 				/* we've entered all possible digits, no cursor */
 			}
@@ -418,14 +416,14 @@ AudioClock::render (cairo_t* cr)
 			if (input_string.empty()) {
 				cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
 				if (!_fixed_width) {
-					cairo_rectangle (cr, 
+					cairo_rectangle (cr,
 							 (get_width()/2.0),
 							 0,
 							 2.0, upper_height);
 				} else {
-					cairo_rectangle (cr, 
+					cairo_rectangle (cr,
 							 (get_width()/2.0),
-							 (upper_height - layout_height)/2.0, 
+							 (upper_height - layout_height)/2.0,
 							 2.0, upper_height);
 				}
 				cairo_fill (cr);
@@ -438,7 +436,7 @@ void
 AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 {
 	CairoWidget::on_size_allocate (alloc);
-	
+
 	if (_left_layout) {
 		upper_height = (get_height()/2.0) - 1.0;
 	} else {
@@ -446,7 +444,10 @@ AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 	}
 
 	if (_fixed_width) {
-		/* center display in available space */
+		/* center display in available space
+		 * NB. this only works if the containing widget is not the
+		 * layout itself (eg. the session->property dialog)
+		 */
 		layout_x_offset = (get_width() - layout_width)/2.0;
 	} else {
 		/* left justify */
@@ -457,11 +458,11 @@ AudioClock::on_size_allocate (Gtk::Allocation& alloc)
 void
 AudioClock::on_size_request (Gtk::Requisition* req)
 {
-	/* even for non fixed width clocks, the size we *ask* for never changes, 
+	/* even for non fixed width clocks, the size we *ask* for never changes,
 	   even though the size we receive might. so once we've computed it,
 	   just return it.
 	*/
-	
+
 	if (first_width) {
 		req->width = first_width;
 		req->height = first_height;
@@ -470,7 +471,7 @@ AudioClock::on_size_request (Gtk::Requisition* req)
 
 	Glib::RefPtr<Pango::Layout> tmp;
 	Glib::RefPtr<Gtk::Style> style = get_style ();
-	Pango::FontDescription font; 
+	Pango::FontDescription font;
 
 	tmp = Pango::Layout::create (get_pango_context());
 
@@ -483,20 +484,31 @@ AudioClock::on_size_request (Gtk::Requisition* req)
 	tmp->set_font_description (font);
 
 	if (_fixed_width) {
+		int ignored;
+		tmp->set_text ("-88:88:88:88");
+		tmp->get_pixel_size (_mode_width[Timecode], ignored);
+		tmp->set_text (" 88888|88|8888");
+		tmp->get_pixel_size (_mode_width[BBT], ignored);
+		tmp->set_text (" 88:88:88,888");
+		tmp->get_pixel_size (_mode_width[MinSec], ignored);
+		tmp->set_text (" 8888888888");
+		tmp->get_pixel_size (_mode_width[Frames], ignored);
+
 		/* this string is the longest thing we will ever display,
-		   and also includes the BBT bar char that may descends below
-		   the baseline a bit, and a comma for the minsecs mode
-		   where we printf a fractional value (XXX or should)
+		   it does not include the BBT bar char that may descend
+			 below the baseline.
+			 note; depending on BPM setting this may actually
+			 not be sufficient for 24h worth of BBT
 		*/
-		
-		tmp->set_text (" 8888888888:,|"); 
+
+		tmp->set_text (" 88888888888::,");
 	} else {
 		switch (_mode) {
 		case Timecode:
-			tmp->set_text (" 88:88:88:88");
+			tmp->set_text ("-88:88:88:88");
 			break;
 		case BBT:
-			tmp->set_text (" 888|88|8888");
+			tmp->set_text (" 88888|88|8888");
 			break;
 		case MinSec:
 			tmp->set_text (" 88:88:88,888");
@@ -528,15 +540,13 @@ AudioClock::on_size_request (Gtk::Requisition* req)
 		   as possible that might change the height.
 		*/
 		tmp->set_text ("qyhH|"); /* one ascender, one descender */
-		
+
 		tmp->get_pixel_size (w, info_height);
-		
+
 		/* silly extra padding that seems necessary to correct the info
 		 * that pango just gave us. I have no idea why.
 		 */
 
-		info_height += 4;
-
 		req->height += info_height;
 		req->height += separator_height;
 	}
@@ -550,7 +560,7 @@ AudioClock::show_edit_status (int length)
 {
 	editing_attr->set_start_index (edit_string.length() - length);
 	editing_attr->set_end_index (edit_string.length());
-	
+
 	editing_attributes.change (*foreground_attr);
 	editing_attributes.change (*editing_attr);
 
@@ -567,8 +577,10 @@ AudioClock::start_edit (Field f)
 		edit_string.clear ();
 		_layout->set_text ("");
 	}
+
 	input_string.clear ();
 	editing = true;
+	edit_is_negative = false;
 
 	if (f) {
 		input_string = get_field (f);
@@ -632,24 +644,24 @@ AudioClock::end_edit (bool modify)
 	if (modify) {
 
 		bool ok = true;
-		
+
 		switch (_mode) {
 		case Timecode:
 			ok = timecode_validate_edit (edit_string);
 			break;
-			
+
 		case BBT:
 			ok = bbt_validate_edit (edit_string);
 			break;
-			
+
 		case MinSec:
 			ok = minsec_validate_edit (edit_string);
 			break;
-			
+
 		case Frames:
 			break;
 		}
-		
+
 		if (!ok) {
 			edit_string = pre_edit_string;
 			input_string.clear ();
@@ -665,7 +677,7 @@ AudioClock::end_edit (bool modify)
 			case Timecode:
 				pos = frames_from_timecode_string (edit_string);
 				break;
-				
+
 			case BBT:
 				if (is_duration) {
 					pos = frame_duration_from_bbt_string (0, edit_string);
@@ -673,11 +685,11 @@ AudioClock::end_edit (bool modify)
 					pos = frames_from_bbt_string (0, edit_string);
 				}
 				break;
-				
+
 			case MinSec:
 				pos = frames_from_minsec_string (edit_string);
 				break;
-				
+
 			case Frames:
 				pos = frames_from_audioframes_string (edit_string);
 				break;
@@ -691,6 +703,7 @@ AudioClock::end_edit (bool modify)
 	} else {
 
 		editing = false;
+		edit_is_negative = false;
 		_layout->set_attributes (normal_attributes);
 		_layout->set_text (pre_edit_string);
 	}
@@ -710,9 +723,9 @@ AudioClock::drop_focus ()
 	if (has_focus()) {
 
 		/* move focus back to the default widget in the top level window */
-		
+
 		Widget* top = get_toplevel();
-		
+
 		if (top->is_toplevel ()) {
 			Window* win = dynamic_cast<Window*> (top);
 			win->grab_focus ();
@@ -720,7 +733,7 @@ AudioClock::drop_focus ()
 	}
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_frames_distance (const std::string& str)
 {
 	framecnt_t f;
@@ -732,7 +745,7 @@ AudioClock::parse_as_frames_distance (const std::string& str)
 	return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_minsec_distance (const std::string& str)
 {
 	framecnt_t sr = _session->frame_rate();
@@ -750,7 +763,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
 	case 4:
 		sscanf (str.c_str(), "%" PRId32, &msecs);
 		return msecs * (sr / 1000);
-		
+
 	case 5:
 		sscanf (str.c_str(), "%1" PRId32 "%" PRId32, &secs, &msecs);
 		return (secs * sr) + (msecs * (sr/1000));
@@ -774,7 +787,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
 	case 10:
 		sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%2" PRId32 "%" PRId32, &hrs, &mins, &secs, &msecs);
 		return (hrs * 3600 * sr) + (mins * 60 * sr) + (secs * sr) + (msecs * (sr/1000));
-	
+
 	default:
 		break;
 	}
@@ -782,7 +795,7 @@ AudioClock::parse_as_minsec_distance (const std::string& str)
 	return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_timecode_distance (const std::string& str)
 {
 	double fps = _session->timecode_frames_per_second();
@@ -791,7 +804,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
 	int secs;
 	int mins;
 	int hrs;
-	
+
 	switch (str.length()) {
 	case 0:
 		return 0;
@@ -807,7 +820,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
 	case 4:
 		sscanf (str.c_str(), "%2" PRId32 "%" PRId32, &secs, &frames);
 		return (secs * sr) + lrint ((frames/(float)fps) * sr);
-		
+
 	case 5:
 		sscanf (str.c_str(), "%1" PRId32 "%2" PRId32 "%" PRId32, &mins, &secs, &frames);
 		return (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
@@ -823,7 +836,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
 	case 8:
 		sscanf (str.c_str(), "%2" PRId32 "%2" PRId32 "%2" PRId32 "%" PRId32, &hrs, &mins, &secs, &frames);
 		return (hrs * 3600 * sr) + (mins * 60 * sr) + (secs * sr) + lrint ((frames/(float)fps) * sr);
-	
+
 	default:
 		break;
 	}
@@ -831,13 +844,13 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
 	return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_bbt_distance (const std::string&)
 {
 	return 0;
 }
 
-framecnt_t 
+framecnt_t
 AudioClock::parse_as_distance (const std::string& instr)
 {
 	switch (_mode) {
@@ -861,24 +874,24 @@ void
 AudioClock::end_edit_relative (bool add)
 {
 	bool ok = true;
-	
+
 	switch (_mode) {
 	case Timecode:
 		ok = timecode_validate_edit (edit_string);
 		break;
-		
+
 	case BBT:
 		ok = bbt_validate_edit (edit_string);
 		break;
-		
+
 	case MinSec:
 		ok = minsec_validate_edit (edit_string);
 		break;
-		
+
 	case Frames:
 		break;
 	}
-		
+
 	if (!ok) {
 		edit_string = pre_edit_string;
 		input_string.clear ();
@@ -902,7 +915,7 @@ AudioClock::end_edit_relative (bool add)
 		} else {
 			framepos_t c = current_time();
 
-			if (c > frames) {
+			if (c > frames || _negative_allowed) {
 				set (c - frames, true);
 			} else {
 				set (0, true);
@@ -916,9 +929,20 @@ AudioClock::end_edit_relative (bool add)
 	drop_focus ();
 }
 
+void
+AudioClock::session_property_changed (const PropertyChange& p)
+{
+	set (last_when, true);
+}
+
 void
 AudioClock::session_configuration_changed (std::string p)
 {
+	if (_negative_allowed) {
+		/* session option editor clock */
+		return;
+	}
+
 	if (p == "sync-source" || p == "external-sync") {
 		set (current_time(), true);
 		return;
@@ -953,11 +977,11 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 
 	if (is_duration) {
 		when = when - offset;
-	} 
+	}
 
 	if (when == last_when && !force) {
-		if (_mode != Timecode) {
-			/* timecode may need to force display of TC source
+		if (_mode != Timecode && _mode != MinSec) {
+			/* may need to force display of TC source
 			 * time, so don't return early.
 			 */
 			return;
@@ -976,15 +1000,18 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 			}
 			set_timecode (when, force);
 			break;
-			
+
 		case BBT:
 			set_bbt (when, force);
 			break;
-			
+
 		case MinSec:
+			if (_right_layout) {
+				_right_layout->set_alignment(Pango::ALIGN_RIGHT);
+			}
 			set_minsec (when, force);
 			break;
-			
+
 		case Frames:
 			set_frames (when, force);
 			break;
@@ -995,6 +1022,63 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset)
 	last_when = when;
 }
 
+void
+AudioClock::set_slave_info ()
+{
+	if (!_left_layout || !_right_layout) {
+		return;
+	}
+
+	SyncSource sync_src = Config->get_sync_source();
+
+	if (_session->config.get_external_sync()) {
+		Slave* slave = _session->slave();
+
+		switch (sync_src) {
+		case JACK:
+			_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+						INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+			_right_layout->set_text ("");
+			break;
+		case MIDIClock:
+			if (slave) {
+				_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+							INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+				_right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+							INFO_FONT_SIZE, slave->approximate_current_delta()));
+			} else {
+				_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+							INFO_FONT_SIZE, _("--pending--")));
+				_right_layout->set_text ("");
+			}
+			break;
+		case LTC:
+		case MTC:
+			if (slave) {
+				bool matching;
+				TimecodeSlave* tcslave;
+				if ((tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
+					matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
+					_left_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2</span><span foreground=\"%3\">%4</span></span>",
+										  INFO_FONT_SIZE, sync_source_to_string(sync_src, true)[0], (matching?"green":"red"),
+										  dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
+					_right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+										   INFO_FONT_SIZE, slave->approximate_current_delta()));
+				}
+			} else {
+				_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
+							INFO_FONT_SIZE, _("--pending--")));
+				_right_layout->set_text ("");
+			}
+			break;
+		}
+	} else {
+		_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">INT/%2</span>",
+					INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
+		_right_layout->set_text ("");
+	}
+}
+
 void
 AudioClock::set_frames (framepos_t when, bool /*force*/)
 {
@@ -1008,10 +1092,10 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
 			_left_layout->set_text ("");
 			_right_layout->set_text ("");
 		}
-		
+
 		return;
 	}
-	
+
 	if (when < 0) {
 		when = -when;
 		negative = true;
@@ -1029,20 +1113,23 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
 		framecnt_t rate = _session->frame_rate();
 
 		if (fmod (rate, 100.0) == 0.0) {
-			sprintf (buf, "SR %.1fkHz", rate/1000.0);
+			sprintf (buf, "%.1fkHz", rate/1000.0);
 		} else {
-			sprintf (buf, "SR %" PRId64, rate);
+			sprintf (buf, "%" PRId64 "Hz", rate);
 		}
 
-		_left_layout->set_text (buf);
+		_left_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">%3</span></span>",
+				INFO_FONT_SIZE, _("SR"), buf));
 
 		float vid_pullup = _session->config.get_video_pullup();
 
 		if (vid_pullup == 0.0) {
-			_right_layout->set_text (_("pullup: \u2012"));
+			_right_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">off</span></span>",
+					INFO_FONT_SIZE, _("Pull")));
 		} else {
-			sprintf (buf, _("%+-6.4f%%"), vid_pullup);
-			_right_layout->set_text (buf);
+			sprintf (buf, _("%+.4f%%"), vid_pullup);
+			_right_layout->set_markup (string_compose ("<span size=\"%1\"><span foreground=\"white\">%2 </span><span foreground=\"green\">%3</span></span>",
+					INFO_FONT_SIZE, _("Pull"), buf));
 		}
 	}
 }
@@ -1065,9 +1152,9 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
 			_left_layout->set_text ("");
 			_right_layout->set_text ("");
 		}
-		
+
 		return;
-	}	
+	}
 
 	if (when < 0) {
 		when = -when;
@@ -1082,7 +1169,7 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
 	secs = (int) floor (left / (float) _session->frame_rate());
 	left -= (framecnt_t) floor (secs * _session->frame_rate());
 	millisecs = floor (left * 1000.0 / (float) _session->frame_rate());
-	
+
 	if (negative) {
 		snprintf (buf, sizeof (buf), "-%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);
 	} else {
@@ -1090,6 +1177,7 @@ AudioClock::set_minsec (framepos_t when, bool /*force*/)
 	}
 
 	_layout->set_text (buf);
+	set_slave_info();
 }
 
 void
@@ -1104,7 +1192,7 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
 			_left_layout->set_text ("");
 			_right_layout->set_text ("");
 		}
-		
+
 		return;
 	}
 
@@ -1123,58 +1211,7 @@ AudioClock::set_timecode (framepos_t when, bool /*force*/)
 
 	_layout->set_text (Timecode::timecode_format_time(TC));
 
-	if (_left_layout && _right_layout) {
-		SyncSource sync_src = Config->get_sync_source();
-
-		if (_session->config.get_external_sync()) {
-			Slave* slave = _session->slave();
-
-			switch (sync_src) {
-			case JACK:
-				_left_layout->set_text (string_compose ("%1",
-							sync_source_to_string(sync_src, true)));
-				_right_layout->set_text ("");
-				break;
-			case MTC:
-				if (slave) {
-					_left_layout->set_text (string_compose ("%1",
-								dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
-					_right_layout->set_text (slave->approximate_current_delta());
-				} else {
-					_left_layout->set_text (string_compose ("--pending--",
-								sync_source_to_string(sync_src, true)));
-					_right_layout->set_text ("");
-				}
-				break;
-			case MIDIClock:
-				if (slave) {
-					_left_layout->set_text (string_compose ("%1",
-								sync_source_to_string(sync_src, true)));
-					_right_layout->set_text (slave->approximate_current_delta());
-				} else {
-					_left_layout->set_text (string_compose ("%1 --pending--",
-								sync_source_to_string(sync_src, true)));
-					_right_layout->set_text ("");
-				}
-				break;
-			case LTC:
-				if (slave) {
-					_left_layout->set_text (string_compose ("%1",
-								dynamic_cast<TimecodeSlave*>(slave)->approximate_current_position()));
-					_right_layout->set_text (slave->approximate_current_delta());
-				} else {
-					_left_layout->set_text (string_compose ("%1 --pending--",
-								sync_source_to_string(sync_src, true)));
-					_right_layout->set_text ("");
-				}
-				break;
-			}
-		} else {
-			_left_layout->set_text (string_compose (_("INT/%1"),
-						sync_source_to_string(sync_src, true)));
-			_right_layout->set_text ("");
-		}
-	}
+	set_slave_info();
 }
 
 void
@@ -1214,15 +1251,15 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
 	}
 
 	if (negative) {
-		snprintf (buf, sizeof (buf), "-%03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32, 
+		snprintf (buf, sizeof (buf), "-%03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32,
 			  BBT.bars, BBT.beats, BBT.ticks);
 	} else {
-		snprintf (buf, sizeof (buf), " %03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32, 
+		snprintf (buf, sizeof (buf), " %03" PRIu32 BBT_BAR_CHAR "%02" PRIu32 BBT_BAR_CHAR "%04" PRIu32,
 			  BBT.bars, BBT.beats, BBT.ticks);
 	}
 
 	_layout->set_text (buf);
-		 
+
 	if (_right_layout) {
 		framepos_t pos;
 
@@ -1235,10 +1272,12 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
 		TempoMetric m (_session->tempo_map().metric_at (pos));
 
 		sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
-		_left_layout->set_text (buf);
+		_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">Tempo <span foreground=\"green\">%2</span></span>",
+					INFO_FONT_SIZE, buf));
 
 		sprintf (buf, "%g/%g", m.meter().divisions_per_bar(), m.meter().note_divisor());
-		_right_layout->set_text (buf);
+		_right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">Meter <span foreground=\"green\">%2</span></span>",
+					INFO_FONT_SIZE, buf));
 	}
 }
 
@@ -1250,6 +1289,7 @@ AudioClock::set_session (Session *s)
 	if (_session) {
 
 		_session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
+		_session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context());
 
 		const XMLProperty* prop;
 		XMLNode* node = _session->extra_xml (X_("ClockModes"));
@@ -1331,12 +1371,18 @@ AudioClock::on_key_press_event (GdkEventKey* ev)
 
 	case GDK_minus:
 	case GDK_KP_Subtract:
-		end_edit_relative (false);
+		if (_negative_allowed && input_string.empty()) {
+				edit_is_negative = true;
+				edit_string.replace(0,1,"-");
+				_layout->set_text (edit_string);
+				queue_draw ();
+		} else {
+			end_edit_relative (false);
+		}
 		return true;
 		break;
 
 	case GDK_plus:
-	case GDK_KP_Add:
 		end_edit_relative (true);
 		return true;
 		break;
@@ -1397,6 +1443,16 @@ AudioClock::on_key_press_event (GdkEventKey* ev)
 		highlight_length = merge_input_and_edit_string ();
 	}
 
+	if (edit_is_negative) {
+		edit_string.replace(0,1,"-");
+	} else {
+		if (pre_edit_string.at(0) == '-') {
+			edit_string.replace(0,1,"_");
+		} else {
+			edit_string.replace(0,1," ");
+		}
+	}
+
 	show_edit_status (highlight_length);
 	_layout->set_text (edit_string);
 	queue_draw ();
@@ -1408,12 +1464,12 @@ int
 AudioClock::merge_input_and_edit_string ()
 {
 	/* merge with pre-edit-string into edit string */
-	
+
 	edit_string = pre_edit_string;
-	
+
 	if (input_string.empty()) {
 		return 0;
-	} 
+	}
 
 	string::size_type target;
 	for (string::size_type i = 0; i < input_string.length(); ++i) {
@@ -1431,7 +1487,7 @@ AudioClock::on_key_release_event (GdkEventKey *ev)
 	if (!editing) {
 		return false;
 	}
-	
+
 	/* return true for keys that we used on press
 	   so that they cannot possibly do double-duty
 	*/
@@ -1528,12 +1584,13 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
 			int x;
 
 			/* the text has been centered vertically, so adjust
-			 * x and y. 
+			 * x and y.
 			 */
+			int xcenter = !_fixed_width || layout_x_offset > 0 ? 0 : (get_width() - _mode_width[_mode]) /2;
 
 			y = ev->y - ((upper_height - layout_height)/2);
-			x = ev->x - layout_x_offset;
-			
+			x = ev->x - layout_x_offset - xcenter;
+
 			if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
 				/* pretend it is a character on the far right */
 				index = 99;
@@ -1549,7 +1606,7 @@ AudioClock::on_button_press_event (GdkEventButton *ev)
 			drag_y = ev->y;
 		}
 		break;
-		
+
 	default:
 		return false;
 		break;
@@ -1571,21 +1628,22 @@ AudioClock::on_button_release_event (GdkEventButton *ev)
 				return true;
 			} else {
 				if (ev->button == 1) {
-					
+
 					if (_edit_by_click_field) {
 
+						int xcenter = !_fixed_width || layout_x_offset > 0 ? 0 : (get_width() - _mode_width[_mode]) /2;
 						int index = 0;
 						int trailing;
 						int y = ev->y - ((upper_height - layout_height)/2);
-						int x = ev->x - layout_x_offset;
+						int x = ev->x - layout_x_offset - xcenter;
 						Field f;
 
 						if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
 							return true;
 						}
-						
+
 						f = index_to_field (index);
-						
+
 						switch (f) {
 						case Timecode_Frames:
 						case MS_Milliseconds:
@@ -1639,19 +1697,20 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
 
 	int y;
 	int x;
-	
+
 	/* the text has been centered vertically, so adjust
-	 * x and y. 
+	 * x and y.
 	 */
 
+	int xcenter = !_fixed_width || layout_x_offset > 0 ? 0 : (get_width() - _mode_width[_mode]) /2;
 	y = ev->y - ((upper_height - layout_height)/2);
-	x = ev->x - layout_x_offset;
+	x = ev->x - layout_x_offset - xcenter;
 
 	if (!_layout->xy_to_index (x * PANGO_SCALE, y * PANGO_SCALE, index, trailing)) {
 		/* not in the main layout */
 		return false;
 	}
-	
+
 	Field f = index_to_field (index);
 	framepos_t frames = 0;
 
@@ -1667,29 +1726,29 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
 			ValueChanged (); /* EMIT_SIGNAL */
 		}
 		break;
-		
+
 	case GDK_SCROLL_DOWN:
 		frames = get_frame_step (f);
 		if (frames != 0) {
 			if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 				frames *= 10;
 			}
-			
-			if ((double)current_time() - (double)frames < 0.0) {
+
+			if (!_negative_allowed && (double)current_time() - (double)frames < 0.0) {
 				set (0, true);
 			} else {
 				set (current_time() - frames, true);
 			}
-			
+
 			ValueChanged (); /* EMIT_SIGNAL */
 		}
 		break;
-		
+
 	default:
 		return false;
 		break;
 	}
-	
+
 	return true;
 }
 
@@ -1863,9 +1922,23 @@ bool
 AudioClock::timecode_validate_edit (const string&)
 {
 	Timecode::Time TC;
+	int hours;
+	char ignored[2];
 
-	if (sscanf (_layout->get_text().c_str(), "%" PRId32 ":%" PRId32 ":%" PRId32 ":%" PRId32, 
-		    &TC.hours, &TC.minutes, &TC.seconds, &TC.frames) != 4) {
+	if (sscanf (_layout->get_text().c_str(), "%[- _]%" PRId32 ":%" PRId32 ":%" PRId32 "%[:;]%" PRId32,
+		    ignored, &hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
+		return false;
+	}
+
+	if (hours < 0) {
+		TC.hours = hours * -1;
+		TC.negative = true;
+	} else {
+		TC.hours = hours;
+		TC.negative = false;
+	}
+
+	if (TC.negative && !_negative_allowed) {
 		return false;
 	}
 
@@ -1894,7 +1967,7 @@ AudioClock::minsec_validate_edit (const string& str)
 	if (sscanf (str.c_str(), "%d:%d:%d.%d", &hrs, &mins, &secs, &millisecs) != 4) {
 		return false;
 	}
-	
+
 	if (hrs > 23 || mins > 59 || secs > 59 || millisecs > 999) {
 		return false;
 	}
@@ -1911,18 +1984,23 @@ AudioClock::frames_from_timecode_string (const string& str) const
 
 	Timecode::Time TC;
 	framepos_t sample;
+	char ignored[2];
+	int hours;
 
-	if (sscanf (str.c_str(), "%d:%d:%d:%d", &TC.hours, &TC.minutes, &TC.seconds, &TC.frames) != 4) {
+	if (sscanf (str.c_str(), "%[- _]%d:%d:%d%[:;]%d", ignored, &hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
 		error << string_compose (_("programming error: %1 %2"), "badly formatted timecode clock string", str) << endmsg;
 		return 0;
 	}
-
+	TC.hours = abs(hours);
 	TC.rate = _session->timecode_frames_per_second();
 	TC.drop= _session->timecode_drop_frames();
 
 	_session->timecode_to_sample (TC, sample, false /* use_offset */, false /* use_subframes */ );
-	
+
 	// timecode_tester ();
+	if (edit_is_negative) {
+		sample = - sample;
+	}
 
 	return sample;
 }
@@ -1959,7 +2037,7 @@ AudioClock::frames_from_bbt_string (framepos_t pos, const string& str) const
 	if (sscanf (str.c_str(), BBT_SCANF_FORMAT, &any.bbt.bars, &any.bbt.beats, &any.bbt.ticks) != 3) {
 		return 0;
 	}
-	
+
 	if (is_duration) {
 		any.bbt.bars++;
 		any.bbt.beats++;
@@ -2053,18 +2131,12 @@ AudioClock::set_mode (Mode m)
 
 	if (_left_layout) {
 
-		if (_mode == Timecode) {
-			_left_layout->set_attributes (small_info_attributes);
-			_right_layout->set_attributes (small_info_attributes);
-		} else {
-			_left_layout->set_attributes (info_attributes);
-			_right_layout->set_attributes (info_attributes);
-		}
+		_left_layout->set_attributes (info_attributes);
+		_right_layout->set_attributes (info_attributes);
 		/* adjust info_height according to font size */
 		int ignored;
 		_left_layout->set_text (" 1234567890");
 		_left_layout->get_pixel_size (ignored, info_height);
-		info_height += 4;
 
 		_left_layout->set_text ("");
 		_right_layout->set_text ("");
@@ -2082,7 +2154,7 @@ AudioClock::set_mode (Mode m)
 		insert_map.push_back (2);
 		insert_map.push_back (1);
 		break;
-		
+
 	case BBT:
 		mode_based_info_ratio = 0.5;
 		insert_map.push_back (11);
@@ -2090,14 +2162,14 @@ AudioClock::set_mode (Mode m)
 		insert_map.push_back (9);
 		insert_map.push_back (8);
 		insert_map.push_back (6);
-		insert_map.push_back (5);	
-		insert_map.push_back (3);	
-		insert_map.push_back (2);	
-		insert_map.push_back (1);	
+		insert_map.push_back (5);
+		insert_map.push_back (3);
+		insert_map.push_back (2);
+		insert_map.push_back (1);
 		break;
-		
+
 	case MinSec:
-		mode_based_info_ratio = 1.0;
+		mode_based_info_ratio = 0.5;
 		insert_map.push_back (12);
 		insert_map.push_back (11);
 		insert_map.push_back (10);
@@ -2105,10 +2177,10 @@ AudioClock::set_mode (Mode m)
 		insert_map.push_back (7);
 		insert_map.push_back (5);
 		insert_map.push_back (4);
-		insert_map.push_back (2);	
-		insert_map.push_back (1);	
+		insert_map.push_back (2);
+		insert_map.push_back (1);
 		break;
-		
+
 	case Frames:
 		mode_based_info_ratio = 0.5;
 		break;
@@ -2140,6 +2212,8 @@ void
 AudioClock::on_style_changed (const Glib::RefPtr<Gtk::Style>& old_style)
 {
 	CairoWidget::on_style_changed (old_style);
+	first_width = 0;
+	first_height = 0;
 	set_font ();
 	set_colors ();
 }
@@ -2162,7 +2236,7 @@ AudioClock::set_is_duration (bool yn)
 }
 
 void
-AudioClock::set_off (bool yn) 
+AudioClock::set_off (bool yn)
 {
 	if (_off == yn) {
 		return;
@@ -2171,9 +2245,9 @@ AudioClock::set_off (bool yn)
 	_off = yn;
 
 	/* force a redraw. last_when will be preserved, but the clock text will
-	 * change 
+	 * change
 	 */
-	
+
 	set (last_when, true);
 }
 
@@ -2187,7 +2261,9 @@ void
 AudioClock::set_corner_radius (double r)
 {
 	corner_radius = r;
-	queue_draw ();
+	first_width = 0;
+	first_height = 0;
+	queue_resize ();
 }
 
 void
@@ -2199,9 +2275,15 @@ AudioClock::set_fixed_width (bool yn)
 void
 AudioClock::dpi_reset ()
 {
-	/* force recomputation of size even if we are fixed width 
+	/* force recomputation of size even if we are fixed width
 	 */
 	first_width = 0;
 	first_height = 0;
 	queue_resize ();
 }
+
+void
+AudioClock::set_negative_allowed (bool yn)
+{
+	_negative_allowed = yn;
+}
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 6235bbaf69..dae6bb1ae4 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -76,6 +76,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	framepos_t current_time (framepos_t position = 0) const;
 	framepos_t current_duration (framepos_t position = 0) const;
 	void set_session (ARDOUR::Session *s);
+        void set_negative_allowed (bool yn); 
 
 	sigc::signal<void> ValueChanged;
 	sigc::signal<void> mode_changed;
@@ -103,6 +104,9 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	int              layout_x_offset;
 	int              em_width;
 	bool             _edit_by_click_field;
+	int              _mode_width[4]; /* enum Mode entries */
+        bool             _negative_allowed;
+        bool             edit_is_negative;
 
 	Glib::RefPtr<Pango::Layout> _layout;
 	Glib::RefPtr<Pango::Layout> _left_layout;
@@ -114,7 +118,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	Pango::AttrList normal_attributes;
 	Pango::AttrList editing_attributes;
 	Pango::AttrList info_attributes;
-	Pango::AttrList small_info_attributes;
 
 	int first_height;
 	int first_width;
@@ -124,6 +127,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	int upper_height;
 	double mode_based_info_ratio;
 	double corner_radius;
+	uint32_t font_size;
 
 	static const double info_font_scale_factor;
 	static const double separator_height;
@@ -182,6 +186,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	void on_size_allocate (Gtk::Allocation&);
 	bool on_focus_out_event (GdkEventFocus*);
 
+	void set_slave_info ();
 	void set_timecode (framepos_t, bool);
 	void set_bbt (framepos_t, bool);
 	void set_minsec (framepos_t, bool);
@@ -193,13 +198,14 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	bool bbt_validate_edit (const std::string&);
 	bool minsec_validate_edit (const std::string&);
 
-	framepos_t frames_from_timecode_string (const std::string&) const;
+        framepos_t frames_from_timecode_string (const std::string&) const;
 	framepos_t frames_from_bbt_string (framepos_t, const std::string&) const;
 	framepos_t frame_duration_from_bbt_string (framepos_t, const std::string&) const;
 	framepos_t frames_from_minsec_string (const std::string&) const;
 	framepos_t frames_from_audioframes_string (const std::string&) const;
 
 	void session_configuration_changed (std::string);
+	void session_property_changed (const PBD::PropertyChange&);
 
 	Field index_to_field () const;
 
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 4b0de7d725..7e51d28997 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -268,7 +268,6 @@ void
 AudioRegionView::region_changed (const PropertyChange& what_changed)
 {
 	ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
-	cerr << "AudioRegionView::region_changed() called" << endl;
 
 	RegionView::region_changed (what_changed);
 
@@ -276,28 +275,21 @@ AudioRegionView::region_changed (const PropertyChange& what_changed)
 		region_scale_amplitude_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_in)) {
-		cerr << region()->name() << " in changed\n";
-		stacktrace (cerr, 40);
 		fade_in_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_out)) {
-		cerr << region()->name() << " out changed\n";
 		fade_out_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_in_active)) {
-		cerr << region()->name() << " in active changed\n";
 		fade_in_active_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_out_active)) {
-		cerr << region()->name() << " out active changed\n";
 		fade_out_active_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_in_is_xfade)) {
-		cerr << region()->name() << " in is xfade changed\n";
 		fade_in_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::fade_out_is_xfade)) {
-		cerr << region()->name() << " out is xfade changed\n";
 		fade_out_changed ();
 	}
 	if (what_changed.contains (ARDOUR::Properties::envelope_active)) {
@@ -776,6 +768,19 @@ AudioRegionView::reset_fade_out_shape_width (framecnt_t width)
 	}
 }
 
+framepos_t
+AudioRegionView::get_fade_in_shape_width ()
+{
+	return audio_region()->fade_in()->back()->when;
+}
+
+framepos_t
+AudioRegionView::get_fade_out_shape_width ()
+{
+	return audio_region()->fade_out()->back()->when;
+}
+
+
 void
 AudioRegionView::set_samples_per_unit (gdouble spu)
 {
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 5e3240670d..85a1b1d869 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -94,6 +94,9 @@ class AudioRegionView : public RegionView
 	void reset_fade_in_shape_width (framecnt_t);
 	void reset_fade_out_shape_width (framecnt_t);
 
+	framepos_t get_fade_in_shape_width ();
+	framepos_t get_fade_out_shape_width ();
+
 	void show_fade_line(framepos_t pos);
 	void hide_fade_line();
 
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 8691e1e2ab..14ed0479a2 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -22,8 +22,11 @@
 #include <vector>
 #include <fstream>
 
-#include "pbd/stl_delete.h"
+#include "boost/shared_ptr.hpp"
+
+#include "pbd/floating.h"
 #include "pbd/memento_command.h"
+#include "pbd/stl_delete.h"
 #include "pbd/stacktrace.h"
 
 #include "ardour/automation_list.h"
@@ -462,6 +465,7 @@ AutomationLine::start_drag_line (uint32_t i1, uint32_t i2, float fraction)
 		);
 
 	_drag_points.clear ();
+
 	for (uint32_t i = i1; i <= i2; i++) {
 		_drag_points.push_back (nth (i));
 	}
@@ -485,14 +489,75 @@ AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XML
 	start_drag_common (0, fraction);
 }
 
-
 struct ControlPointSorter
 {
-	bool operator() (ControlPoint const * a, ControlPoint const * b) {
+	bool operator() (ControlPoint const * a, ControlPoint const * b) const {
+		if (floateq (a->get_x(), b->get_x(), 1)) {
+			return a->view_index() < b->view_index();
+		} 
 		return a->get_x() < b->get_x();
 	}
 };
 
+AutomationLine::ContiguousControlPoints::ContiguousControlPoints (AutomationLine& al)
+	: line (al), before_x (0), after_x (DBL_MAX) 
+{
+}
+
+void
+AutomationLine::ContiguousControlPoints::compute_x_bounds ()
+{
+	if (!empty()) {
+		/* determine the limits on x-axis motion for this 
+		   contiguous range of control points
+		*/
+		
+		if (front()->view_index() > 0) {
+			before_x = line.nth (front()->view_index() - 1)->get_x();
+		}
+		
+		if (back()->view_index() < (line.npoints() - 2)) {
+			after_x = line.nth (back()->view_index() + 1)->get_x();
+		}
+	}
+}
+
+double 
+AutomationLine::ContiguousControlPoints::clamp_dx (double dx) 
+{
+	if (empty()) {
+		return dx;
+	}
+
+	/* get the maximum distance we can move any of these points along the x-axis
+	 */
+	
+	double tx; /* possible position a point would move to, given dx */
+	ControlPoint* cp;
+	
+	if (dx > 0) {
+		/* check the last point, since we're moving later in time */
+		cp = back();
+	} else {
+		/* check the first point, since we're moving earlier in time */
+		cp = front();
+	}
+
+	tx = cp->get_x() + dx; // new possible position if we just add the motion 
+	tx = max (tx, before_x); // can't move later than following point
+	tx = min (tx, after_x);  // can't move earlier than preceeding point
+	return  tx - cp->get_x (); 
+}
+
+void 
+AutomationLine::ContiguousControlPoints::move (double dx, double dy) 
+{
+	for (std::list<ControlPoint*>::iterator i = begin(); i != end(); ++i) {
+		(*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - line.height() * dy, ControlPoint::Full);
+		line.reset_line_coords (**i);
+	}
+}
+
 /** Common parts of starting a drag.
  *  @param x Starting x position in units, or 0 if x is being ignored.
  *  @param fraction Starting y position (as a fraction of the track height, where 0 is the bottom and 1 the top)
@@ -506,21 +571,12 @@ AutomationLine::start_drag_common (double x, float fraction)
 	_drag_had_movement = false;
 	did_push = false;
 
-	_drag_points.sort (ControlPointSorter ());
+	/* they are probably ordered already, but we have to make sure */
 
-	/* find the additional points that will be dragged when the user is holding
-	   the "push" modifier
-	*/
-
-	uint32_t i = _drag_points.back()->view_index () + 1;
-	ControlPoint* p = 0;
-	_push_points.clear ();
-	while ((p = nth (i)) != 0 && p->can_slide()) {
-		_push_points.push_back (p);
-		++i;
-	}
+	_drag_points.sort (ControlPointSorter());
 }
 
+
 /** Should be called to indicate motion during a drag.
  *  @param x New x position of the drag in canvas units, or undefined if ignore_x == true.
  *  @param fraction New y fraction.
@@ -529,65 +585,66 @@ AutomationLine::start_drag_common (double x, float fraction)
 pair<double, float>
 AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool with_push)
 {
-	/* setup the points that are to be moved this time round */
-	list<ControlPoint*> points = _drag_points;
-	if (with_push) {
-		copy (_push_points.begin(), _push_points.end(), back_inserter (points));
-		points.sort (ControlPointSorter ());
+	if (_drag_points.empty()) {
+		return pair<double,float> (x,fraction);
 	}
 
 	double dx = ignore_x ? 0 : (x - _drag_x);
 	double dy = fraction - _last_drag_fraction;
 
-	for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
-		/* Find the points that aren't being moved before and after
-		   this one on the control_points list
+	if (!_drag_had_movement) {
+
+		/* "first move" ... do some stuff that we don't want to do if 
+		   no motion ever took place, but need to do before we handle
+		   motion.
 		*/
-
-		ControlPoint* before = 0;
-		ControlPoint* after = 0;
-
-		ControlPoint* last = 0;
-		for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
-
-			if (*j == *i) {
-				
-				before = last;
-				
-				vector<ControlPoint*>::iterator k = j;
-
-				/* Next point */
-				++k;
-
-				/* Now move past any points that are being moved this time */
-				while (find (points.begin(), points.end(), *k) != points.end() && k != control_points.end ()) {
-					++k;
-				}
-				
-				if (k != control_points.end()) {
-					after = *k;
-				}
-				break;
-			}
-
-			if (find (points.begin(), points.end(), *j) == points.end ()) {
-				/* This point isn't being moved, so it's the `last' point we've seen */
-				last = *j;
+	
+		/* partition the points we are dragging into (potentially several)
+		 * set(s) of contiguous points. this will not happen with a normal
+		 * drag, but if the user does a discontiguous selection, it can.
+		 */
+		
+		uint32_t expected_view_index = 0;
+		CCP contig;
+		
+		for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
+			if (i == _drag_points.begin() || (*i)->view_index() != expected_view_index) {
+				contig.reset (new ContiguousControlPoints (*this));
+				contiguous_points.push_back (contig);
 			}
+			contig->push_back (*i);
+			expected_view_index = (*i)->view_index() + 1;
 		}
 
-		/* Clamp dx for this point */
-		double const before_x = before ? before->get_x() : 0;
-		double const after_x = after ? after->get_x() : DBL_MAX;
+		if (contiguous_points.back()->empty()) {
+			contiguous_points.pop_back ();
+		}
 
-		double tx = (*i)->get_x() + dx;
-		tx = max (tx, before_x);
-		tx = min (tx, after_x);
-		dx = tx - (*i)->get_x ();
+		for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+			(*ccp)->compute_x_bounds ();
+		}
+	}	
+
+	/* OK, now on to the stuff related to *this* motion event. First, for
+	 * each contiguous range, figure out the maximum x-axis motion we are
+	 * allowed (because of neighbouring points that are not moving.
+	 * 
+	 * if we are moving forwards with push, we don't need to do this, 
+	 * since all later points will move too.
+	 */
+
+	if (dx < 0 || ((dx > 0) && !with_push)) {
+		for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+			double dxt = (*ccp)->clamp_dx (dx);
+			if (fabs (dxt) < fabs (dx)) {
+				dx = dxt;
+			}
+		}
 	}
 
 	/* clamp y */
-	for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
+	
+	for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
 		double const y = ((_height - (*i)->get_y()) / _height) + dy;
 		if (y < 0) {
 			dy -= y;
@@ -597,34 +654,36 @@ AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool
 		}
 	}
 
-	pair<double, float> const clamped (_drag_x + dx, _last_drag_fraction + dy);
+	if (dx || dy) {
+
+		/* and now move each section */
+		
+		for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+			(*ccp)->move (dx, dy);
+		}
+		if (with_push) {
+			uint32_t i = contiguous_points.back()->back()->view_index () + 1;
+			ControlPoint* p;
+			while ((p = nth (i)) != 0 && p->can_slide()) {
+				p->move_to (p->get_x() + dx, p->get_y(), ControlPoint::Full);
+				reset_line_coords (*p);
+				++i;
+			}
+		}
+
+		/* update actual line coordinates (will queue a redraw)
+		 */
+		
+		line->property_points() = line_points;
+	}
+	
 	_drag_distance += dx;
 	_drag_x += dx;
 	_last_drag_fraction = fraction;
-
-	for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
-		(*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - _height * dy, ControlPoint::Full);
-		reset_line_coords (**i);
-	}
-
-	if (with_push) {
-		/* move push points, preserving their y */
-		for (list<ControlPoint*>::iterator i = _push_points.begin(); i != _push_points.end(); ++i) {
-			(*i)->move_to ((*i)->get_x() + dx, (*i)->get_y(), ControlPoint::Full);
-			reset_line_coords (**i);
-		}
-	}
-
-	if (line_points.size() > 1) {
-		line->property_points() = line_points;
-	}
-
 	_drag_had_movement = true;
-	if (with_push) {
-		did_push = with_push;
-	}
+	did_push = with_push;
 
-	return clamped;
+	return pair<double, float> (_drag_x + dx, _last_drag_fraction + dy);
 }
 
 /** Should be called to indicate the end of a drag */
@@ -636,16 +695,7 @@ AutomationLine::end_drag ()
 	}
 
 	alist->freeze ();
-
-	/* set up the points that were moved this time round */
-	list<ControlPoint*> points = _drag_points;
-	if (did_push) {
-		copy (_push_points.begin(), _push_points.end(), back_inserter (points));
-		points.sort (ControlPointSorter ());
-	}
-
-	sync_model_with_view_points (points);
-
+	sync_model_with_view_points (_drag_points);
 	alist->thaw ();
 
 	update_pending = false;
@@ -656,6 +706,8 @@ AutomationLine::end_drag ()
 
 	trackview.editor().session()->set_dirty ();
 	did_push = false;
+
+	contiguous_points.clear ();
 }
 
 void
@@ -769,9 +821,7 @@ AutomationLine::remove_point (ControlPoint& cp)
  *  @param result Filled in with selectable things; in this case, ControlPoints.
  */
 void
-AutomationLine::get_selectables (
-	framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results
-	)
+AutomationLine::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results)
 {
 	/* convert fractions to display coordinates with 0 at the top of the track */
 	double const bot_track = (1 - topfrac) * trackview.current_height ();
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 73734bcd40..16a410a2fc 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -80,10 +80,10 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	bool control_points_adjacent (double xval, uint32_t& before, uint32_t& after);
 
 	/* dragging API */
-	virtual void start_drag_single (ControlPoint*, double, float);
-	virtual void start_drag_line (uint32_t, uint32_t, float);
-	virtual void start_drag_multiple (std::list<ControlPoint*>, float, XMLNode *);
-	virtual std::pair<double, float> drag_motion (double, float, bool, bool);
+        virtual void start_drag_single (ControlPoint*, double, float);
+        virtual void start_drag_line (uint32_t, uint32_t, float);
+        virtual void start_drag_multiple (std::list<ControlPoint*>, float, XMLNode *);
+        virtual std::pair<double, float> drag_motion (double, float, bool, bool with_push);
 	virtual void end_drag ();
 
 	ControlPoint* nth (uint32_t);
@@ -182,9 +182,26 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	ArdourCanvas::Points        line_points; /* coordinates for canvas line */
 	std::vector<ControlPoint*>  control_points; /* visible control points */
 
+        class ContiguousControlPoints : public std::list<ControlPoint*> {
+	  public:
+	    ContiguousControlPoints (AutomationLine& al);
+	    double clamp_dx (double dx);
+	    void move (double dx, double dy);
+	    void compute_x_bounds ();
+	  private:
+	    AutomationLine& line;
+	    double before_x;
+	    double after_x;
+	};
+
+        friend class ContiguousControlPoints;
+
+	typedef boost::shared_ptr<ContiguousControlPoints> CCP;
+        std::vector<CCP> contiguous_points;
+
 	void sync_model_with_view_point (ControlPoint&);
 	void sync_model_with_view_points (std::list<ControlPoint*>);
-	void start_drag_common (double, float);
+        void start_drag_common (double, float);
 
 	virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
 
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 672d4e1256..b4a570836e 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -141,11 +141,8 @@ CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
 CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
 CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
 
+CANVAS_VARIABLE(canvasvar_ButtonBorder, "border color")
 #define BUTTON_VARS(root,name) \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \
 CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \
 CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \
 CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d07ac8794a..5d8ef2b373 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -80,7 +80,6 @@
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "bundle_manager.h"
-#include "button_joiner.h"
 #include "canvas-noevent-text.h"
 #include "canvas_impl.h"
 #include "crossfade_edit.h"
@@ -208,12 +207,6 @@ static const gchar *_rb_opt_strings[] = {
 };
 #endif
 
-void
-show_me_the_size (Requisition* r, const char* what)
-{
-	cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
-}
-
 static void
 pane_size_watcher (Paned* pane)
 {
@@ -800,6 +793,12 @@ Editor::add_toplevel_controls (Container& cont)
 	cont.show_all ();
 }
 
+bool
+Editor::get_smart_mode () const
+{
+	return ( (current_mouse_mode() == Editing::MouseObject) && smart_mode_action->get_active() );
+}
+
 void
 Editor::catch_vanishing_regionview (RegionView *rv)
 {
@@ -2108,10 +2107,17 @@ Editor::set_snap_to (SnapType st)
 	case SnapToBeatDiv5:
 	case SnapToBeatDiv4:
 	case SnapToBeatDiv3:
-	case SnapToBeatDiv2:
-		compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
-		update_tempo_based_rulers ();
+	case SnapToBeatDiv2: {
+		ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin;
+		ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end;
+		
+		compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(),
+					    current_bbt_points_begin, current_bbt_points_end);
+		compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames(),
+					 current_bbt_points_begin, current_bbt_points_end);
+		update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end);
 		break;
+	}
 
 	case SnapToRegionStart:
 	case SnapToRegionEnd:
@@ -2317,7 +2323,14 @@ Editor::set_state (const XMLNode& node, int /*version*/)
 	}
 
 	if ((prop = node.property ("join-object-range"))) {
-		ActionManager::set_toggle_action ("MouseMode", "set-mouse-mode-object-range", string_is_affirmative (prop->value ()));
+		RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object-range"));
+		bool yn = string_is_affirmative (prop->value());
+		if (act) {
+			RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+			tact->set_active (!yn);
+			tact->set_active (yn);
+		}
+		set_mouse_mode(mouse_mode, true);
 	}
 
 	if ((prop = node.property ("edit-point"))) {
@@ -2828,14 +2841,12 @@ Editor::setup_toolbar ()
 	mode_box->set_spacing(4);
 
 	HBox* mouse_mode_box = manage (new HBox);
-	HBox* mouse_mode_hbox1 = manage (new HBox);
-	HBox* mouse_mode_hbox2 = manage (new HBox);
-	VBox* mouse_mode_vbox1 = manage (new VBox);
-	VBox* mouse_mode_vbox2 = manage (new VBox);
-	Alignment* mouse_mode_align1 = manage (new Alignment);
-	Alignment* mouse_mode_align2 = manage (new Alignment);
+	HBox* mouse_mode_hbox = manage (new HBox);
+	VBox* mouse_mode_vbox = manage (new VBox);
+	Alignment* mouse_mode_align = manage (new Alignment);
 
 	Glib::RefPtr<SizeGroup> mouse_mode_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
+//	mouse_mode_size_group->add_widget (smart_mode_button);
 	mouse_mode_size_group->add_widget (mouse_move_button);
 	mouse_mode_size_group->add_widget (mouse_select_button);
 	mouse_mode_size_group->add_widget (mouse_zoom_button);
@@ -2848,30 +2859,24 @@ Editor::setup_toolbar ()
 	/* make them just a bit bigger */
 	mouse_move_button.set_size_request (-1, 25);
 
-	smart_mode_joiner = manage (new ButtonJoiner ("mouse mode button", mouse_move_button, mouse_select_button, true));
-	smart_mode_joiner->set_related_action (smart_mode_action);
+	mouse_mode_hbox->set_spacing (2);
 
-	mouse_mode_hbox2->set_spacing (2);
-	mouse_mode_box->set_spacing (2);
+	mouse_mode_hbox->pack_start (smart_mode_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_move_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_select_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_zoom_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_gain_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_timefx_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_audition_button, false, false);
+	mouse_mode_hbox->pack_start (mouse_draw_button, false, false);
+	mouse_mode_hbox->pack_start (internal_edit_button, false, false, 8);
 
-	mouse_mode_hbox1->pack_start (*smart_mode_joiner, false, false);
-	mouse_mode_hbox2->pack_start (mouse_zoom_button, false, false);
-	mouse_mode_hbox2->pack_start (mouse_gain_button, false, false);
-	mouse_mode_hbox2->pack_start (mouse_timefx_button, false, false);
-	mouse_mode_hbox2->pack_start (mouse_audition_button, false, false);
-	mouse_mode_hbox2->pack_start (mouse_draw_button, false, false);
-	mouse_mode_hbox2->pack_start (internal_edit_button, false, false);
+	mouse_mode_vbox->pack_start (*mouse_mode_hbox);
 
-	mouse_mode_vbox1->pack_start (*mouse_mode_hbox1, false, false);
-	mouse_mode_vbox2->pack_start (*mouse_mode_hbox2, false, false);
+	mouse_mode_align->add (*mouse_mode_vbox);
+	mouse_mode_align->set (0.5, 1.0, 0.0, 0.0);
 
-	mouse_mode_align1->add (*mouse_mode_vbox1);
-	mouse_mode_align1->set (0.5, 1.0, 0.0, 0.0);
-	mouse_mode_align2->add (*mouse_mode_vbox2);
-	mouse_mode_align2->set (0.5, 1.0, 0.0, 0.0);
-
-	mouse_mode_box->pack_start (*mouse_mode_align1, false, false);
-	mouse_mode_box->pack_start (*mouse_mode_align2, false, false);
+	mouse_mode_box->pack_start (*mouse_mode_align, false, false);
 
 	edit_mode_strings.push_back (edit_mode_to_string (Slide));
 	if (!Profile->get_sae()) {
@@ -2911,22 +2916,19 @@ Editor::setup_toolbar ()
 	RefPtr<Action> act;
 
 	zoom_in_button.set_name ("zoom button");
-	zoom_in_button.set_image (::get_icon ("zoom_in"));
-	zoom_in_button.set_tweaks (ArdourButton::ShowClick);
+	zoom_in_button.add (*(manage (new Image (::get_icon ("zoom_in")))));
 	act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
-	zoom_in_button.set_related_action (act);
+	act->connect_proxy (zoom_in_button);
 
 	zoom_out_button.set_name ("zoom button");
-	zoom_out_button.set_image (::get_icon ("zoom_out"));
-	zoom_out_button.set_tweaks (ArdourButton::ShowClick);
+	zoom_out_button.add (*(manage (new Image (::get_icon ("zoom_out")))));
 	act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
-	zoom_out_button.set_related_action (act);
+	act->connect_proxy (zoom_out_button);
 
 	zoom_out_full_button.set_name ("zoom button");
-	zoom_out_full_button.set_image (::get_icon ("zoom_full"));
-	zoom_out_full_button.set_tweaks (ArdourButton::ShowClick);
+	zoom_out_full_button.add (*(manage (new Image (::get_icon ("zoom_full")))));
 	act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
-	zoom_out_full_button.set_related_action (act);
+	act->connect_proxy (zoom_out_full_button);
 
 	zoom_focus_selector.set_name ("ZoomFocusSelector");
 	set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
@@ -3052,15 +3054,15 @@ Editor::setup_toolbar ()
 void
 Editor::setup_tooltips ()
 {
-	ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects"));
-	ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
+	ARDOUR_UI::instance()->set_tip (smart_mode_button, _("Smart Mode (add Range functions to Object mode)"));
+	ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Object Mode (select/move Objects)"));
+	ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Range Mode (select/move Ranges)"));
 	ARDOUR_UI::instance()->set_tip (mouse_draw_button, _("Draw/Edit MIDI Notes"));
 	ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Region Gain"));
 	ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range"));
 	ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions and MIDI Notes"));
 	ARDOUR_UI::instance()->set_tip (mouse_audition_button, _("Listen to Specific Regions"));
-	ARDOUR_UI::instance()->set_tip (smart_mode_joiner, _("Smart Mode (Select/Move Objects + Ranges)"));
-	ARDOUR_UI::instance()->set_tip (internal_edit_button, _("Edit Region Contents (e.g. notes)"));
+	ARDOUR_UI::instance()->set_tip (internal_edit_button, _("Note Level Editing"));
 	ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: click to (de)activate\nContext-click for other operations"));
 	ARDOUR_UI::instance()->set_tip (nudge_forward_button, _("Nudge Region/Selection Later"));
 	ARDOUR_UI::instance()->set_tip (nudge_backward_button, _("Nudge Region/Selection Earlier"));
@@ -3260,15 +3262,9 @@ Editor::duplicate_range (bool with_dialog)
 {
 	float times = 1.0f;
 
-	if (mouse_mode == MouseRange) {
-		if (selection->time.length() == 0) {
-			return;
-		}
-	}
-
 	RegionSelection rs = get_regions_from_selection_and_entered ();
 
-	if (mouse_mode != MouseRange && rs.empty()) {
+	if ( selection->time.length() == 0 && rs.empty()) {
 		return;
 	}
 
@@ -3315,7 +3311,7 @@ Editor::duplicate_range (bool with_dialog)
 		times = adjustment.get_value();
 	}
 
-	if (mouse_mode == MouseRange) {
+	if (selection->time.length() != 0) {
 		duplicate_selection (times);
 	} else {
 		duplicate_some_regions (rs, times);
@@ -3659,9 +3655,10 @@ Editor::set_show_measures (bool yn)
 		hide_measures ();
 
 		if ((_show_measures = yn) == true) {
-			if (tempo_lines)
+			if (tempo_lines) {
 				tempo_lines->show();
-			draw_measures ();
+			}
+			(void) redraw_measures ();
 		}
 		instant_save ();
 	}
@@ -4203,9 +4200,7 @@ Editor::set_frames_per_unit (double fpu)
 		zoom_range_clock->set (frames);
 	}
 
-	bool const showing_time_selection =
-		mouse_mode == MouseRange ||
-		(mouse_mode == MouseObject && _join_object_range_state != JOIN_OBJECT_RANGE_NONE);
+	bool const showing_time_selection = selection->time.length() > 0;
 
 	if (showing_time_selection && selection->time.start () != selection->time.end_frame ()) {
 		for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
@@ -4255,6 +4250,7 @@ Editor::idle_visual_changer ()
 	   super-rapid-screen-update can be dropped if we are still processing
 	   the last one.
 	*/
+
 	pending_visual_change.idle_handler_id = -1;
 	pending_visual_change.being_handled = true;
 	
@@ -4267,9 +4263,15 @@ Editor::idle_visual_changer ()
 		set_frames_per_unit (pending_visual_change.frames_per_unit);
 
 		compute_fixed_ruler_scale ();
-		compute_current_bbt_points(pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_frames());
-		compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_frames());
-		update_tempo_based_rulers ();
+
+		ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin;
+		ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end;
+		
+		compute_current_bbt_points (pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_frames(),
+					    current_bbt_points_begin, current_bbt_points_end);
+		compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_frames(),
+					 current_bbt_points_begin, current_bbt_points_end);
+		update_tempo_based_rulers (current_bbt_points_end, current_bbt_points_begin);
 	}
 	if (p & VisualChange::TimeOrigin) {
 		set_horizontal_position (pending_visual_change.time_origin / frames_per_unit);
@@ -5306,8 +5308,6 @@ Editor::session_going_away ()
 
 	stop_step_editing ();
 	
-	current_bbt_points_begin = current_bbt_points_end;
-
 	/* get rid of any existing editor mixer strip */
 
 	WindowTitle title(Glib::get_application_name());
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index d53972afc3..086b5ed5b8 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -286,6 +286,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	bool extend_selection_to_track (TimeAxisView&);
 
 	void play_selection ();
+	framepos_t get_preroll ();
+	void maybe_locate_with_edit_preroll (framepos_t);
+	void play_with_preroll ();
 	void select_all_in_track (Selection::Operation op);
 	void select_all (Selection::Operation op);
 	void invert_selection_in_track ();
@@ -806,7 +809,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void update_just_timecode ();
 	void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers
 	void update_fixed_rulers ();
-	void update_tempo_based_rulers ();
+        void update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+					ARDOUR::TempoMap::BBTPointList::const_iterator& end);
 	void popup_ruler_menu (framepos_t where = 0, ItemType type = RegionItem);
 	void update_ruler_visibility ();
 	void set_ruler_visible (RulerType, bool);
@@ -870,7 +874,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	gint bbt_nmarks;
 	uint32_t bbt_bar_helper_on;
 	uint32_t bbt_accent_modulo;
-	void compute_bbt_ruler_scale (framepos_t lower, framepos_t upper);
+        void compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
+				      ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin,
+				      ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end);
 
 	gint metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint);
 	gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint);
@@ -1247,6 +1253,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
 	boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
 
+        void toggle_midi_input_active (bool flip_others);
+
 	ARDOUR::InterThreadInfo* current_interthread_info;
 
 	AnalysisWindow* analysis_window;
@@ -1473,15 +1481,13 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	/// true if we are in fullscreen mode
 	bool _maximised;
 
-	ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin;
-	ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end;
-
 	TempoLines* tempo_lines;
 
 	ArdourCanvas::Group* time_line_group;
 
 	void hide_measures ();
-	void draw_measures ();
+        void draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+			    ARDOUR::TempoMap::BBTPointList::const_iterator& end);
 	bool redraw_measures ();
 
 	void new_tempo_section ();
@@ -1546,7 +1552,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void remove_metric_marks ();
 	void draw_metric_marks (const ARDOUR::Metrics& metrics);
 
-	void compute_current_bbt_points (framepos_t left, framepos_t right);
+        void compute_current_bbt_points (framepos_t left, framepos_t right, 
+					 ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+					 ARDOUR::TempoMap::BBTPointList::const_iterator& end);
+
 	void tempo_map_changed (const PBD::PropertyChange&);
 	void redisplay_tempo (bool immediate_redraw);
 
@@ -1560,9 +1569,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void editor_list_button_toggled ();
 
 	AudioClock*               zoom_range_clock;
-	ArdourButton              zoom_in_button;
-	ArdourButton              zoom_out_button;
-	ArdourButton              zoom_out_full_button;
+	Gtk::Button              zoom_in_button;
+	Gtk::Button              zoom_out_button;
+	Gtk::Button              zoom_out_full_button;
 
 	Gtk::Button              tav_expand_button;
 	Gtk::Button              tav_shrink_button;
@@ -1581,11 +1590,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	ArdourButton mouse_timefx_button;
 	ArdourButton mouse_audition_button;
 
-	ButtonJoiner* smart_mode_joiner;
+	ArdourButton smart_mode_button;
 	Glib::RefPtr<Gtk::ToggleAction> smart_mode_action;
 
 	void                     mouse_mode_toggled (Editing::MouseMode m);
-	void			 mouse_mode_object_range_toggled () {}
+	void			 mouse_mode_object_range_toggled ();
 	bool                     ignore_mouse_mode_toggle;
 
 	ArdourButton internal_edit_button;
@@ -1671,6 +1680,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void marker_selection_changed ();
 
 	void cancel_selection ();
+	void cancel_time_selection ();
+
+	bool get_smart_mode() const;
 
 	bool audio_region_selection_covers (framepos_t where);
 
@@ -2092,16 +2104,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	int time_fx (ARDOUR::RegionList&, float val, bool pitching);
 
-	bool doing_range_stuff() const {
-		return (mouse_mode == Editing::MouseRange && (_join_object_range_state == JOIN_OBJECT_RANGE_NONE)) ||
-			_join_object_range_state == JOIN_OBJECT_RANGE_RANGE;
-	}
-	
-	bool doing_object_stuff() const {
-		return (mouse_mode == Editing::MouseObject && (_join_object_range_state == JOIN_OBJECT_RANGE_NONE)) ||
-			_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT;
-	}
-
 	void toggle_sound_midi_notes ();
 
 	/** Flag for a bit of a hack wrt control point selection; see set_selected_control_point_from_click */
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index e274170982..54894f9746 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -23,6 +23,7 @@
 #include "pbd/file_utils.h"
 
 #include "gtkmm2ext/tearoff.h"
+#include "gtkmm2ext/utils.h"
 
 #include "ardour/filesystem_paths.h"
 #include "ardour/profile.h"
@@ -403,6 +404,12 @@ Editor::register_actions ()
 	Glib::RefPtr<ActionGroup> mouse_mode_actions = ActionGroup::create (X_("MouseMode"));
 	RadioAction::Group mouse_mode_group;
 
+	act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Smart Object Mode"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));	
+	smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act);
+	smart_mode_button.set_related_action (smart_mode_action);
+	smart_mode_button.set_text (_("Smart"));
+	smart_mode_button.set_name ("mouse mode button");
+
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
 	mouse_move_button.set_related_action (act);
 	mouse_move_button.set_image (::get_icon("tool_object"));
@@ -418,9 +425,6 @@ Editor::register_actions ()
 	mouse_draw_button.set_image (::get_icon("midi_tool_pencil"));
 	mouse_draw_button.set_name ("mouse mode button");
 
-	act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Link Object / Range Tools"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled));	
-	smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act);
-
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));	
 	mouse_gain_button.set_related_action (act);
 	mouse_gain_button.set_image (::get_icon("tool_gain"));
@@ -534,7 +538,7 @@ Editor::register_actions ()
 	ruler_meter_action->set_active (true);
 	ruler_tempo_action->set_active (true);
 	ruler_marker_action->set_active (true);
-	ruler_range_action->set_active (false);
+	ruler_range_action->set_active (true);
 	ruler_loop_punch_action->set_active (true);
 	ruler_loop_punch_action->set_active (true);
 	if (Profile->get_sae()) {
@@ -623,6 +627,9 @@ Editor::register_actions ()
 	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 	tact->set_active (true);
 
+	ActionManager::register_action (editor_actions, X_("toggle-midi-input-active"), _("Toggle MIDI Input Active for Editor-Selected Tracks/Busses"), 
+				   sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false));
+
 	ActionManager::add_action_group (rl_actions);
 	ActionManager::add_action_group (ruler_actions);
 	ActionManager::add_action_group (zoom_actions);
@@ -1486,6 +1493,15 @@ Editor::parameter_changed (std::string p)
 		if (_routes) {
 			_routes->reset_remote_control_ids ();
 		}
+	} else if (p == "use-tooltips") {
+
+		/* this doesn't really belong here but it has to go somewhere */
+
+		if (Config->get_use_tooltips()) {
+			Gtkmm2ext::enable_tooltips ();
+		} else {
+			Gtkmm2ext::disable_tooltips ();
+		}
 	}
 }
 
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 4b7d40cdce..15bd51b3ba 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -66,7 +66,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 	switch (direction) {
 	case GDK_SCROLL_UP:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+			//for mouse-wheel zoom, force zoom-focus to mouse
+			Editing::ZoomFocus temp_focus = zoom_focus;
+			zoom_focus = Editing::ZoomFocusMouse;
 			temporal_zoom_step (false);
+			zoom_focus = temp_focus;
 			return true;
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
 			direction = GDK_SCROLL_LEFT;
@@ -91,7 +95,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
 	case GDK_SCROLL_DOWN:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+			//for mouse-wheel zoom, force zoom-focus to mouse
+			Editing::ZoomFocus temp_focus = zoom_focus;
+			zoom_focus = Editing::ZoomFocusMouse;
 			temporal_zoom_step (true);
+			zoom_focus = temp_focus;
 			return true;
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
 			direction = GDK_SCROLL_RIGHT;
@@ -468,6 +476,7 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 
 	case GDK_BUTTON_RELEASE:
 		ret = button_release_handler (item, event, FadeInHandleItem);
+		maybe_locate_with_edit_preroll ( rv->region()->position() );
 		break;
 
 	case GDK_MOTION_NOTIFY:
@@ -549,6 +558,7 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 
 	case GDK_BUTTON_RELEASE:
 		ret = button_release_handler (item, event, FadeOutHandleItem);
+		maybe_locate_with_edit_preroll ( rv->region()->last_frame() - rv->get_fade_out_shape_width() );
 		break;
 
 	case GDK_MOTION_NOTIFY:
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 42af2bb9fc..e8bce456e8 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -899,9 +899,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
 
 	}
 
-	if (_editor->session() && Config->get_always_play_range()) {
-		_editor->session()->request_locate (_editor->get_selection().regions.start());
-	}
+	_editor->maybe_locate_with_edit_preroll (_editor->get_selection().regions.start());
 }
 
 void
@@ -1792,6 +1790,13 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
 			}
 		}
 
+		if (_operation == StartTrim) {
+			_editor->maybe_locate_with_edit_preroll ( _views.begin()->view->region()->position() );
+		}
+		if (_operation == EndTrim) {
+			_editor->maybe_locate_with_edit_preroll ( _views.begin()->view->region()->position() + _views.begin()->view->region()->length() );
+		}
+	
 		if (!_editor->selection->selected (_primary)) {
 			_primary->thaw_after_trim ();
 		} else {
@@ -2884,7 +2889,6 @@ ControlPointDrag::motion (GdkEvent* event, bool)
 	cx_frames = min (cx_frames, _point->line().maximum_time());
 
 	float const fraction = 1.0 - (cy / _point->line().height());
-
 	bool const push = Keyboard::modifier_state_contains (event->button.state, Keyboard::PrimaryModifier);
 
 	_point->line().drag_motion (_editor->frame_to_unit_unrounded (cx_frames), fraction, false, push);
@@ -3457,10 +3461,15 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
 		framepos_t grab = grab_frame ();
 
 		if (first_move) {
-			_editor->snap_to (grab);
+			grab = adjusted_current_frame (event, false);
+			if (grab < pending_position) {
+				_editor->snap_to (grab, -1);
+			}  else {
+				_editor->snap_to (grab, 1);
+			}
 		}
 
-		if (pending_position < grab_frame()) {
+		if (pending_position < grab) {
 			start = pending_position;
 			end = grab;
 		} else {
@@ -3592,13 +3601,11 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
 
 		/* XXX what if its a music time selection? */
 		if (s) {
-			if ((s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) {
+			if ( s->get_play_range() && s->transport_rolling() ) {
 				s->request_play_range (&_editor->selection->time, true);
 			} else {
-				if (Config->get_always_play_range()) {
-					if (_editor->doing_range_stuff()) {
-						s->request_locate (_editor->get_selection().time.start());
-					} 
+				if (Config->get_always_play_range() && !s->transport_rolling()) {
+					s->request_locate (_editor->get_selection().time.start());
 				}
 			}
 		}
@@ -3606,28 +3613,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
 	} else {
 		/* just a click, no pointer movement.
 		 */
-
-		if (Keyboard::no_modifier_keys_pressed (&event->button)) {
-			if (!_time_selection_at_start) {
-				if (_editor->clicked_regionview) {
-					if (_editor->get_selection().selected (_editor->clicked_regionview)) {
-						/* range select the entire current
-						   region selection
-						*/
-						_editor->select_range (_editor->get_selection().regions.start(), 
-								       _editor->get_selection().regions.end_frame());
-					} else {
-						/* range select this (unselected)
-						 * region
-						 */
-						_editor->select_range (_editor->clicked_regionview->region()->position(), 
-								       _editor->clicked_regionview->region()->last_frame());
-					}
-				}
-			} else {
-				_editor->selection->clear_time();
-			}
-		}
+		_editor->selection->clear_time();
 
 		if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) {
 			_editor->selection->set (_editor->clicked_axisview);
@@ -3637,11 +3623,6 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
 			s->request_stop (false, false);
 		}
 
-		if (Config->get_always_play_range()) {
-			if (_editor->doing_range_stuff()) {
-				s->request_locate (_editor->get_selection().time.start());
-			} 
-		}
 	}
 
 	_editor->stop_canvas_autoscroll ();
@@ -3718,7 +3699,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move)
 		crect = _editor->cd_marker_bar_drag_rect;
 		break;
 	default:
-		cerr << "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()" << endl;
+		error << string_compose (_("programming_error: %1"), "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()") << endmsg;
 		return;
 		break;
 	}
@@ -4295,7 +4276,6 @@ AutomationRangeDrag::motion (GdkEvent*, bool /*first_move*/)
 
 	for (list<Line>::iterator l = _lines.begin(); l != _lines.end(); ++l) {
 		float const f = y_fraction (l->line, _drags->current_pointer_y());
-
 		/* we are ignoring x position for this drag, so we can just pass in anything */
 		l->line->drag_motion (0, f, true, false);
 		show_verbose_cursor_text (l->line->get_verbose_cursor_relative_string (l->original_fraction, f));
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index 752e43a585..f4c8f1bb0b 100644
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -603,7 +603,12 @@ Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* even
 		//where = tavi->get_position() ;
 	}
 
-
+/*
+ 	//locate so user can audition the edit
+	if ( !session->transport_rolling() && Config->get_always_play_range()) {
+		locate_with_edit_preroll ( arv->region()->position() );
+	}
+*/
 }
 
 
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 28706ac7bc..1eae5d7b38 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1175,11 +1175,9 @@ Editor::marker_menu_set_from_selection ()
 
 			/* if range selection use first to last */
 
-			if (mouse_mode == Editing::MouseRange) {
-				if (!selection->time.empty()) {
-					l->set_start (selection->time.start());
-					l->set_end (selection->time.end_frame());
-				}
+			if (!selection->time.empty()) {
+				l->set_start (selection->time.start());
+				l->set_end (selection->time.end_frame());
 			}
 			else {
 				if (!selection->regions.empty()) {
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 12b5ff3f30..b7eb05affc 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -22,6 +22,7 @@
 #endif
 
 #include <glibmm/miscutils.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
@@ -75,6 +76,23 @@ Editor::show_editor_mixer (bool yn)
 
 	show_editor_mixer_when_tracks_arrive = false;
 
+	if (yn) {
+		Glib::RefPtr<Gdk::Window> win = get_window ();
+		Glib::RefPtr<Gdk::Screen> screen;
+		
+		if (get_window()) {
+			 screen = win->get_screen();
+		} else {
+			screen = Gdk::Screen::get_default();
+		}
+
+		if (screen && screen->get_height() < 700) {
+			Gtk::MessageDialog msg (_("This screen is not tall enough to display the editor mixer"));
+			msg.run ();
+			return;
+		}
+	}
+
 	if (!_session) {
 		show_editor_mixer_when_tracks_arrive = yn;
 		return;
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 61e8b5d035..97cbc4a9ff 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -293,7 +293,7 @@ Editor::set_canvas_cursor ()
 	}
 
 	/* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
-	if (smart_mode_action->get_active()) {
+	if ( get_smart_mode() ) {
 		double x, y;
 		get_pointer_position (x, y);
 		ArdourCanvas::Item* i = track_canvas->get_item_at (x, y);
@@ -308,6 +308,21 @@ Editor::set_canvas_cursor ()
 	set_canvas_cursor (current_canvas_cursor, true);
 }
 
+void
+Editor::mouse_mode_object_range_toggled()
+{
+	MouseMode m = mouse_mode;
+	
+	Glib::RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+	assert (act);
+	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+	assert (tact);
+	if (tact->get_active())
+		m = MouseObject;  //Smart mode turned to ON, force editing to Object mode
+	
+	set_mouse_mode(m, true);  //call this so the button styles can get updated
+}
+
 void
 Editor::set_mouse_mode (MouseMode m, bool force)
 {
@@ -360,7 +375,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 	tact->set_active (false);
 	tact->set_active (true);
 
-	MouseModeChanged (); /* EMIT SIGNAL */
+	//NOTE:  this will result in a call to mouse_mode_toggled which does the heavy lifting
 }
 
 void
@@ -432,29 +447,25 @@ Editor::mouse_mode_toggled (MouseMode m)
 
 	instant_save ();
 
-	if (!internal_editing()) {
-		if (mouse_mode != MouseRange && mouse_mode != MouseGain && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
-
-			/* in all modes except range, gain and joined object/range, hide the range selection,
-			   show the object (region) selection.
-			*/
-
-			for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-				(*i)->hide_selection ();
-			}
-
-		} else {
-
-			/*
-			  in range or object/range mode, show the range selection.
-			*/
-
-			for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-				(*i)->show_selection (selection->time);
-			}
+	//TODO:  set button styles for smart buttons
+/*
+	if ( smart_mode_action->get_active() ) {
+		if( mouse_mode == MouseObject ) { //smart active and object active
+			smart_mode_button.set_active(1);
+			smart_mode_button.set_name("smart mode button");
+			mouse_move_button.set_name("smart mode button");
+		} else {  //smart active but object inactive
+			smart_mode_button.set_active(0);
+			smart_mode_button.set_name("smart mode button");
+			mouse_move_button.set_name("mouse mode button");
 		}
+	} else {
+		smart_mode_button.set_active(0);
+		smart_mode_button.set_name("mouse mode button");
+		mouse_move_button.set_name("mouse mode button");
 	}
-
+*/
+	
 	set_canvas_cursor ();
 	set_gain_envelope_visibility ();
 
@@ -560,11 +571,9 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 	*/
 
 	if (((mouse_mode != MouseObject) &&
-	     (_join_object_range_state != JOIN_OBJECT_RANGE_OBJECT) &&
 	     (mouse_mode != MouseAudition || item_type != RegionItem) &&
 	     (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
 	     (mouse_mode != MouseGain) &&
-	     (mouse_mode != MouseRange) &&
 	     (mouse_mode != MouseDraw)) ||
 	    ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
 	    (internal_editing() && mouse_mode != MouseTimeFX)) {
@@ -589,12 +598,10 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 
 	switch (item_type) {
 	case RegionItem:
-		if (!doing_range_stuff()) {
-			set_selected_regionview_from_click (press, op);
-		}
-		
 		if (press) {
-			if (doing_range_stuff()) {
+			if (mouse_mode != MouseRange) {
+				set_selected_regionview_from_click (press, op);
+			} else {
 				/* don't change the selection unless the
 				   clicked track is not currently selected. if
 				   so, "collapse" the selection to just this
@@ -604,6 +611,10 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 					set_selected_track_as_side_effect (Selection::Set);
 				}
 			}
+		} else {
+			if (mouse_mode != MouseRange) {
+				set_selected_regionview_from_click (press, op);
+			}
 		}
 		break;
 
@@ -611,7 +622,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
  	case RegionViewName:
 	case LeftFrameHandle:
 	case RightFrameHandle:
-		if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+		if ( mouse_mode != MouseRange ) {
 			set_selected_regionview_from_click (press, op);
 		} else if (event->type == GDK_BUTTON_PRESS) {
 			set_selected_track_as_side_effect (op);
@@ -624,7 +635,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 	case FadeOutItem:
 	case StartCrossFadeItem:
 	case EndCrossFadeItem:
-		if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+		if ( mouse_mode != MouseRange ) {
 			set_selected_regionview_from_click (press, op);
 		} else if (event->type == GDK_BUTTON_PRESS) {
 			set_selected_track_as_side_effect (op);
@@ -633,7 +644,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 
 	case ControlPointItem:
 		set_selected_track_as_side_effect (op);
-		if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+		if ( mouse_mode != MouseRange ) {
 			set_selected_control_point_from_click (press, op);
 		}
 		break;
@@ -801,7 +812,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 				pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
 				if (tvp.first) {
 					AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
-					if (smart_mode_action->get_active() && atv) {
+					if ( get_smart_mode() && atv) {
 						/* smart "join" mode: drag automation */
 						_drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
 					} else {
@@ -835,7 +846,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
 		case LeftFrameHandle:
 		case RightFrameHandle:
-			if (!internal_editing() && doing_object_stuff() && !clicked_regionview->region()->locked()) {
+			if (!internal_editing() && !clicked_regionview->region()->locked()) {
 				RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
 				_drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
 				return true;
@@ -956,9 +967,9 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 				}
 
 
-				if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE && !selection->regions.empty())) {
-					_drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
-				}
+//				if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE && !selection->regions.empty())) {
+//					_drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
+//				}
 
 				_drags->start_grab (event);
 				break;
@@ -1035,7 +1046,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
 			case SelectionItem:
 			{
-				if (smart_mode_action->get_active()) {
+				if ( get_smart_mode() ) {
 					/* we're in "smart" joined mode, and we've clicked on a Selection */
 					double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
 					pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
@@ -1049,7 +1060,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 						/* if we're over a track and a region, and in the `object' part of a region,
 						   put a selection around the region and drag both
 						*/
-						RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
+/*						RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
 						if (rtv && _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
 							boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (rtv->route ());
 							if (t) {
@@ -1070,6 +1081,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 								}
 							}
 						}
+*/
 					}
 				}
 				break;
@@ -1290,8 +1302,6 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 		return true;
 	}
 
-
-
 	if (internal_editing()) {
 		bool leave_internal_edit_mode = false;
 
@@ -1344,6 +1354,13 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 		return true;
 	}
 
+	//not rolling, range mode click + join_play_range :  locate the PH here
+	if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && Config->get_always_play_range() ) {
+		framepos_t where = event_frame (event, 0, 0);
+		snap_to(where);
+		_session->request_locate (where, false);
+	}
+
 	switch (event->button.button) {
 	case 1:
 		return button_press_handler_1 (item, event, item_type);
@@ -1415,7 +1432,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 		were_dragging = true;
 	}
 
-        update_region_layering_order_editor ();
+    update_region_layering_order_editor ();
 
 	/* edit events get handled here */
 
@@ -1458,7 +1475,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 	}
 
 	/* context menu events get handled here */
-
 	if (Keyboard::is_context_menu_event (&event->button)) {
 
 		context_click_event = *event;
@@ -1813,7 +1829,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		break;
 
 	case RegionViewNameHighlight:
-		if (is_drawable() && doing_object_stuff() && entered_regionview) {
+		if (is_drawable() && effective_mouse_mode() == MouseObject && entered_regionview) {
 			set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
 			_over_region_trim_target = true;
 		}
@@ -1821,7 +1837,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
 	case LeftFrameHandle:
 	case RightFrameHandle:
-		if (is_drawable() && doing_object_stuff() && !internal_editing() && entered_regionview) {
+		if (is_drawable() && effective_mouse_mode() == MouseObject && !internal_editing() && entered_regionview) {
 			set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
 		}
                 break;
@@ -1947,7 +1963,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		}
 		break;
 	case SelectionItem:
-		if (smart_mode_action->get_active()) {
+		if ( get_smart_mode() ) {
 			set_canvas_cursor ();
 		}
 		break;
@@ -2412,6 +2428,15 @@ Editor::cancel_selection ()
 	clicked_selection = 0;
 }
 
+void
+Editor::cancel_time_selection ()
+{
+    for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+		(*i)->hide_selection ();
+	}
+	selection->time.clear ();
+	clicked_selection = 0;
+}	
 
 void
 Editor::point_trim (GdkEvent* event, framepos_t new_bound)
@@ -2771,7 +2796,7 @@ Editor::update_join_object_range_location (double /*x*/, double y)
 	   that we're over requires searching the playlist.
 	*/
 
-	if (!smart_mode_action->get_active() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+	if ( !get_smart_mode() ) {
 		_join_object_range_state = JOIN_OBJECT_RANGE_NONE;
 		return;
 	}
@@ -2795,10 +2820,8 @@ Editor::update_join_object_range_location (double /*x*/, double y)
 			rtv->canvas_display()->w2i (cx, cy);
 
 			double const c = cy / (rtv->view()->child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
-			double d;
-			double const f = modf (c, &d);
 
-			_join_object_range_state = f < 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
+			_join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
 		}
 	}
 }
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 0aac921afd..eac60fd332 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2169,6 +2169,55 @@ Editor::play_selection ()
 	_session->request_play_range (&selection->time, true);
 }
 
+framepos_t
+Editor::get_preroll ()
+{
+	return 1.0 /*Config->get_edit_preroll_seconds()*/ * _session->frame_rate();
+}
+
+
+void
+Editor::maybe_locate_with_edit_preroll ( framepos_t location )
+{
+	if ( _session->transport_rolling() || !Config->get_always_play_range() )
+		return;
+
+	location -= get_preroll();
+	
+	//don't try to locate before the beginning of time
+	if ( location < 0 ) 
+		location = 0;
+		
+	//if follow_playhead is on, keep the playhead on the screen
+	if ( _follow_playhead )
+		if ( location < leftmost_frame ) 
+			location = leftmost_frame;
+
+	_session->request_locate( location );
+}
+
+void
+Editor::play_with_preroll ()
+{
+	if (selection->time.empty()) {
+		return;
+	} else {
+		framepos_t preroll = get_preroll();
+		
+		framepos_t start = 0;
+		if (selection->time[clicked_selection].start > preroll)
+			start = selection->time[clicked_selection].start - preroll;
+		
+		framepos_t end = selection->time[clicked_selection].end + preroll;
+		
+		AudioRange ar (start, end, 0);
+		list<AudioRange> lar;
+		lar.push_back (ar);
+
+		_session->request_play_range (&lar, true);
+	}
+}
+
 void
 Editor::play_location (Location& location)
 {
@@ -2676,7 +2725,7 @@ Editor::separate_region_from_selection ()
 	   returns a single range.
 	*/
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if (!selection->time.empty()) {
 
 		separate_regions_between (selection->time);
 
@@ -3237,8 +3286,10 @@ Editor::trim_region (bool front)
 
 			if (front) {
 				(*i)->region()->trim_front (where);
+				maybe_locate_with_edit_preroll ( where );
 			} else {
 				(*i)->region()->trim_end (where);
+				maybe_locate_with_edit_preroll ( where );
 			}
 
 			_session->add_command (new StatefulDiffCommand ((*i)->region()));
@@ -3590,7 +3641,7 @@ Editor::copy ()
 bool
 Editor::can_cut_copy () const
 {
-	switch (current_mouse_mode()) {
+	switch (effective_mouse_mode()) {
 
 	case MouseObject:
 		if (!selection->regions.empty() || !selection->points.empty()) {
@@ -3649,7 +3700,8 @@ Editor::cut_copy (CutCopyOp op)
 		}
 	}
 
-	cut_buffer->clear ();
+	if ( op != Clear )  //"Delete" doesn't change copy/paste buf
+		cut_buffer->clear ();
 
 	if (entered_marker) {
 
@@ -3668,7 +3720,7 @@ Editor::cut_copy (CutCopyOp op)
 
 	if (internal_editing()) {
 
-		switch (current_mouse_mode()) {
+		switch (effective_mouse_mode()) {
 		case MouseObject:
 		case MouseRange:
 			cut_copy_midi (op);
@@ -3679,19 +3731,62 @@ Editor::cut_copy (CutCopyOp op)
 
 	} else {
 
-		RegionSelection rs;
+	RegionSelection rs; 
 
-		/* we only want to cut regions if some are selected */
+	/* we only want to cut regions if some are selected */
 
-		if (doing_object_stuff()) {
-			rs = get_regions_from_selection ();
+	if (!selection->regions.empty()) {
+		rs = get_regions_from_selection ();
+	}
+
+	switch (effective_mouse_mode()) {
+/*
+ * 		case MouseGain: {
+			//find regions's gain line
+			AudioRegionView *rview = dynamic_cast<AudioRegionView*>(clicked_regionview);
+				AutomationTimeAxisView *tview = dynamic_cast<AutomationTimeAxisView*>(clicked_trackview);
+			if (rview) {
+				AudioRegionGainLine *line = rview->get_gain_line();
+				if (!line) break;
+				
+				//cut region gain points in the selection
+				AutomationList& alist (line->the_list());
+				XMLNode &before = alist.get_state();
+				AutomationList* what_we_got = 0;
+				if ((what_we_got = alist.cut (selection->time.front().start - rview->audio_region()->position(), selection->time.front().end - rview->audio_region()->position())) != 0) {
+					session->add_command(new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
+					delete what_we_got;
+					what_we_got = 0;
+				}
+				
+				rview->set_envelope_visible(true);
+				rview->audio_region()->set_envelope_active(true);
+				
+			} else if (tview) {
+				AutomationLine *line = *(tview->lines.begin());
+				if (!line) break;
+				
+				//cut auto points in the selection
+				AutomationList& alist (line->the_list());
+				XMLNode &before = alist.get_state();
+				AutomationList* what_we_got = 0;
+				if ((what_we_got = alist.cut (selection->time.front().start, selection->time.front().end)) != 0) {
+					session->add_command(new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
+					delete what_we_got;
+					what_we_got = 0;
+				}		
+			} else
+				break;
+		} break;
+*/			
+		case MouseObject: 
+		case MouseRange:
 			if (!rs.empty() || !selection->points.empty()) {
-
 				begin_reversible_command (opname + _(" objects"));
 
 				if (!rs.empty()) {
 					cut_copy_regions (op, rs);
-
+					
 					if (op == Cut || op == Delete) {
 						selection->clear_regions ();
 					}
@@ -3704,16 +3799,11 @@ Editor::cut_copy (CutCopyOp op)
 						selection->clear_points ();
 					}
 				}
-				commit_reversible_command ();
-				goto out;
-			}
-			if (!selection->time.empty() && (_join_object_range_state == JOIN_OBJECT_RANGE_NONE)) {
-				/* don't cause suprises */
-				goto out;
-			}
-		}
 
-		if (doing_range_stuff()) {
+				commit_reversible_command ();	
+				break;
+			} 
+			
 			if (selection->time.empty()) {
 				framepos_t start, end;
 				if (!get_edit_op_range (start, end)) {
@@ -3721,18 +3811,22 @@ Editor::cut_copy (CutCopyOp op)
 				}
 				selection->set (start, end);
 			}
-
+				
 			begin_reversible_command (opname + _(" range"));
 			cut_copy_ranges (op);
 			commit_reversible_command ();
-
+			
 			if (op == Cut || op == Delete) {
 				selection->clear_time ();
 			}
+
+			break;
+			
+		default:
+			break;
 		}
 	}
 
-  out:
 	if (op == Delete || op == Cut || op == Clear) {
 		_drags->abort ();
 	}
@@ -4746,8 +4840,6 @@ Editor::insert_patch_change (bool from_context)
 
 	const framepos_t p = get_preferred_edit_position (false, from_context);
 
-	cerr << "Got " << rs.size() << " regions to add patch change to\n";
-
 	/* XXX: bit of a hack; use the MIDNAM from the first selected region;
 	   there may be more than one, but the PatchChangeDialog can only offer
 	   one set of patch menus.
@@ -5386,14 +5478,15 @@ Editor::set_playhead_cursor ()
 			_session->request_locate (where, _session->transport_rolling());
 		}
 	}
+
+	if ( Config->get_always_play_range() )
+		cancel_time_selection();
 }
 
 void
 Editor::split_region ()
 {
-	if (((mouse_mode == MouseRange) ||
-	     (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) &&
-	    !selection->time.empty()) {
+	if ( !selection->time.empty()) {
 		separate_regions_between (selection->time);
 		return;
 	}
@@ -6828,3 +6921,26 @@ Editor::uncombine_regions ()
 	commit_reversible_command ();
 }
 
+void
+Editor::toggle_midi_input_active (bool flip_others)
+{
+	bool onoff;
+	boost::shared_ptr<RouteList> rl (new RouteList);
+
+	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+		RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView *>(*i);
+
+		if (!rtav) {
+			continue;
+		}
+
+		boost::shared_ptr<MidiTrack> mt = rtav->midi_track();
+
+		if (mt) {
+			rl->push_back (rtav->route());
+			onoff = !mt->input_active();
+		}
+	}
+	
+	_session->set_exclusive_input_active (rl, onoff, flip_others);
+}
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index c23cf2f656..7fcc669d65 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -69,6 +69,7 @@ EditorRoutes::EditorRoutes (Editor* e)
 	: EditorComponent (e)
         , _ignore_reorder (false)
         , _no_redisplay (false)
+        , _adding_routes (false)
         , _menu (0)
         , old_focus (0)
         , selection_countdown (0)
@@ -600,9 +601,12 @@ void
 EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 {
 	TreeModel::Row row;
+	PBD::Unwinder<bool> at (_adding_routes, true);
 
 	suspend_redisplay ();
 
+	_display.set_model (Glib::RefPtr<ListStore>());
+
 	for (list<RouteTimeAxisView*>::iterator x = routes.begin(); x != routes.end(); ++x) {
 
 		boost::shared_ptr<MidiTrack> midi_trk = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route());
@@ -653,6 +657,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 		(*x)->route()->solo_isolated_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context());
 		(*x)->route()->solo_safe_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context());
 		(*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ());
+
 	}
 
 	update_rec_display ();
@@ -662,7 +667,9 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 	update_solo_safe_display ();
 	update_input_active_display ();
 	update_active_display ();
+
 	resume_redisplay ();
+	_display.set_model (_model);
 
 	/* now update route order keys from the treeview/track display order */
 
@@ -672,7 +679,9 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 void
 EditorRoutes::handle_gui_changes (string const & what, void*)
 {
-	ENSURE_GUI_THREAD (*this, &EditorRoutes::handle_gui_changes, what, src)
+	if (_adding_routes) {
+		return;
+	}
 
 	if (what == "track_height") {
 		/* Optional :make tracks change height while it happens, instead
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 4933a9496f..6118a2b057 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -154,6 +154,7 @@ private:
 
 	bool _ignore_reorder;
 	bool _no_redisplay;
+        bool _adding_routes;
 
 	Gtk::Menu* _menu;
         Gtk::Widget* old_focus;
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 8cc7b20416..3c73f0ce23 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -847,12 +847,16 @@ Editor::update_fixed_rulers ()
 }
 
 void
-Editor::update_tempo_based_rulers ()
+Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+				    ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
 	if (_session == 0) {
 		return;
 	}
 
+	compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_frames(),
+				 begin, end);
+
 	ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_unit;
 
 	if (ruler_bbt_action->get_active()) {
@@ -1146,7 +1150,9 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble
 
 
 void
-Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
+Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
+				 ARDOUR::TempoMap::BBTPointList::const_iterator begin,
+				 ARDOUR::TempoMap::BBTPointList::const_iterator end)
 {
 	if (_session == 0) {
 		return;
@@ -1237,18 +1243,18 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
 		break;
 	}
 
-	if (distance (current_bbt_points_begin, current_bbt_points_end) == 0) {
+	if (distance (begin, end) == 0) {
 		return;
 	}
 
-	i = current_bbt_points_end;
+	i = end;
 	i--;
-	if ((*i).beat >= (*current_bbt_points_begin).beat) {
-		bbt_bars = (*i).bar - (*current_bbt_points_begin).bar;
+	if ((*i).beat >= (*begin).beat) {
+		bbt_bars = (*i).bar - (*begin).bar;
 	} else {
-		bbt_bars = (*i).bar - (*current_bbt_points_begin).bar - 1;
+		bbt_bars = (*i).bar - (*begin).bar - 1;
 	}
-	beats = distance (current_bbt_points_begin, current_bbt_points_end) - bbt_bars;
+	beats = distance (begin, end) - bbt_bars;
 
 	/* Only show the bar helper if there aren't many bars on the screen */
 	if ((bbt_bars < 2) || (beats < 5)) {
@@ -1279,7 +1285,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
 }
 
 gint
-Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
+Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
 {
 	if (_session == 0) {
 		return 0;
@@ -1304,14 +1310,19 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 	bool i_am_accented = false;
 	bool helper_active = false;
 
-	if (distance (current_bbt_points_begin, current_bbt_points_end) == 0) {
+	ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+	ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+	compute_current_bbt_points (lower, upper, begin, end);
+
+	if (distance (begin, end) == 0) {
 		return 0;
 	}
 
 	switch (bbt_ruler_scale) {
 
 	case bbt_show_beats:
-		beats = distance (current_bbt_points_begin, current_bbt_points_end);
+		beats = distance (begin, end);
 		bbt_nmarks = beats + 2;
 
 		*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
@@ -1320,7 +1331,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 		(*marks)[0].position = lower;
 		(*marks)[0].style = GtkCustomRulerMarkMicro;
 		
-		for (n = 1, i = current_bbt_points_begin; n < bbt_nmarks && i != current_bbt_points_end; ++i) {
+		for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
 
 			if ((*i).frame < lower && (bbt_bar_helper_on)) {
 				snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1347,7 +1358,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 	case bbt_show_ticks:
 
-		beats = distance (current_bbt_points_begin, current_bbt_points_end);
+		beats = distance (begin, end);
 		bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
 		bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
@@ -1357,7 +1368,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 		(*marks)[0].position = lower;
 		(*marks)[0].style = GtkCustomRulerMarkMicro;
 
-		for (n = 1, i = current_bbt_points_begin; n < bbt_nmarks && i != current_bbt_points_end; ++i) {
+		for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
 
 			if ((*i).frame < lower && (bbt_bar_helper_on)) {
 				snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1437,7 +1448,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 	case bbt_show_ticks_detail:
 
-		beats = distance (current_bbt_points_begin, current_bbt_points_end);
+		beats = distance (begin, end);
 		bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
 		bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
@@ -1447,7 +1458,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 		(*marks)[0].position = lower;
 		(*marks)[0].style = GtkCustomRulerMarkMicro;
 
-		for (n = 1,   i = current_bbt_points_begin; n < bbt_nmarks && i != current_bbt_points_end; ++i) {
+		for (n = 1,   i = begin; n < bbt_nmarks && i != end; ++i) {
 
 			if ((*i).frame < lower && (bbt_bar_helper_on)) {
 			        snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1532,7 +1543,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 	case bbt_show_ticks_super_detail:
 
-		beats = distance (current_bbt_points_begin, current_bbt_points_end);
+		beats = distance (begin, end);
 		bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
 		bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
@@ -1542,7 +1553,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 		(*marks)[0].position = lower;
 		(*marks)[0].style = GtkCustomRulerMarkMicro;
 
-		for (n = 1,   i = current_bbt_points_begin; n < bbt_nmarks && i != current_bbt_points_end; ++i) {
+		for (n = 1,   i = begin; n < bbt_nmarks && i != end; ++i) {
 
 			if ((*i).frame < lower && (bbt_bar_helper_on)) {
 				  snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
@@ -1639,7 +1650,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 	case bbt_show_64:
         		bbt_nmarks = (gint) (bbt_bars / 64) + 1;
 			*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
-			for (n = 0,   i = current_bbt_points_begin; i != current_bbt_points_end && n < bbt_nmarks; i++) {
+			for (n = 0,   i = begin; i != end && n < bbt_nmarks; i++) {
 				if ((*i).is_bar()) {
 					if ((*i).bar % 64 == 1) {
 						if ((*i).bar % 256 == 1) {
@@ -1664,7 +1675,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 	case bbt_show_16:
        		bbt_nmarks = (bbt_bars / 16) + 1;
 	        *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
-		for (n = 0,  i = current_bbt_points_begin; i != current_bbt_points_end && n < bbt_nmarks; i++) {
+		for (n = 0,  i = begin; i != end && n < bbt_nmarks; i++) {
 		        if ((*i).is_bar()) {
 			  if ((*i).bar % 16 == 1) {
 			        if ((*i).bar % 64 == 1) {
@@ -1689,7 +1700,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 	case bbt_show_4:
 		bbt_nmarks = (bbt_bars / 4) + 1;
  		*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
-		for (n = 0,   i = current_bbt_points_begin; i != current_bbt_points_end && n < bbt_nmarks; ++i) {
+		for (n = 0,   i = begin; i != end && n < bbt_nmarks; ++i) {
 		        if ((*i).is_bar()) {
 			  if ((*i).bar % 4 == 1) {
 			        if ((*i).bar % 16 == 1) {
@@ -1715,7 +1726,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
   //	default:
 	        bbt_nmarks = bbt_bars + 2;
 	        *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks );
-		for (n = 0,  i = current_bbt_points_begin; i != current_bbt_points_end && n < bbt_nmarks; i++) {
+		for (n = 0,  i = begin; i != end && n < bbt_nmarks; i++) {
 		        if ((*i).is_bar()) {
 			  if ((*i).bar % 4 == 1) {
 				        snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 7b08eaeaa6..7ee19bdcec 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -962,9 +962,7 @@ Editor::track_selection_changed ()
 			(*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
 		}
 
-		if (yn &&
-		    ((mouse_mode == MouseRange) ||
-		     ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+		if (yn) {
 			(*i)->reshow_selection (selection->time);
 		} else {
 			(*i)->hide_selection ();
@@ -1298,8 +1296,8 @@ Editor::region_selection_changed ()
 		sensitize_all_region_actions (true);
 	}
 
-	if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->regions.empty()) {
-		_session->request_locate (selection->regions.start());
+	if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
+		maybe_locate_with_edit_preroll (selection->regions.start());
 	}
 }
 
@@ -1354,17 +1352,48 @@ Editor::select_all (Selection::Operation op)
 {
 	list<Selectable *> touched;
 
-	if (_internal_editing) {
-		select_all_internal_edit (op);
-		return;
+	TrackViewList ts;
+
+	if (selection->tracks.empty()) {
+		if (entered_track) {
+			ts.push_back (entered_track);
+		} else {
+			ts = track_views;
+		}
+	} else {
+		ts = selection->tracks;
 	}
 
-	for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
+	if (_internal_editing) {
+
+		bool midi_selected = false;
+
+		for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
+			if ((*iter)->hidden()) {
+				continue;
+			}
+			
+			RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*iter);
+
+			if (rtav && rtav->is_midi_track()) {
+				midi_selected = true;
+				break;
+			}
+		}
+
+		if (midi_selected) {
+			select_all_internal_edit (op);
+			return;
+		}
+	}
+
+	for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
 		if ((*iter)->hidden()) {
 			continue;
 		}
 		(*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 	}
+
 	begin_reversible_command (_("select all"));
 	switch (op) {
 	case Selection::Add:
@@ -1770,7 +1799,7 @@ Editor::select_range_between ()
 	framepos_t start;
 	framepos_t end;
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if ( !selection->time.empty() ) {
 		selection->clear_time ();
 	}
 
@@ -1788,9 +1817,9 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 	framepos_t m;
 	bool ignored;
 
-	/* in range mode, use any existing selection */
+	/* if an explicit range exists, use it */
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if (!selection->time.empty()) {
 		/* we know that these are ordered */
 		start = selection->time.start();
 		end = selection->time.end_frame();
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 7ce74f414b..e7ddb650ed 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -55,6 +55,7 @@ EditorSummary::EditorSummary (Editor* e)
 	  _old_follow_playhead (false)
 {
 	Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
+	Route::RemoteControlIDChange.connect (route_ctrl_id_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
 	_editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), boost::bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
 
 	add_events (Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
@@ -562,7 +563,7 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
 		}
 
 		set_editor (x, y);
-		set_cursor (_start_position);
+		// set_cursor (_start_position);
 
 	} else if (_zoom_dragging) {
 
@@ -687,7 +688,7 @@ EditorSummary::set_editor (double const x, double const y)
 		   as it also means that we won't change these variables if an idle handler
 		   is merely pending but not executing.  But c'est la vie.
 		*/
-
+		
 		return;
 	}
 
@@ -906,9 +907,9 @@ EditorSummary::playhead_position_changed (framepos_t p)
 	int const o = int (_last_playhead);
 	int const n = int (playhead_frame_to_position (p));
 	if (_session && o != n) {
-		int a = min (o, n);
+		int a = max(2, min (o, n));
 		int b = max (o, n);
-		set_overlays_dirty (a - 1, 0, b + 1, get_height ());
+		set_overlays_dirty (a - 2, 0, b + 2, get_height ());
 	}
 }
 
diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index c1afc3237f..f6aa804f59 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -122,6 +122,7 @@ private:
 	bool _old_follow_playhead;
 
 	PBD::ScopedConnectionList position_connection;
+	PBD::ScopedConnection route_ctrl_id_connection;
 	PBD::ScopedConnectionList region_property_connection;
 };
 
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 005e7ff6fd..c9147d69db 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -114,10 +114,13 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
 		tempo_lines->tempo_map_changed();
 	}
 
-	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
+	ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+	ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(), begin, end);
 	_session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
 	redraw_measures ();
-	update_tempo_based_rulers ();
+	update_tempo_based_rulers (begin, end);
 }
 
 void
@@ -127,7 +130,11 @@ Editor::redisplay_tempo (bool immediate_redraw)
 		return;
 	}
 
-	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
+	ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_begin;
+	ARDOUR::TempoMap::BBTPointList::const_iterator current_bbt_points_end;
+
+	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(),
+				    current_bbt_points_begin, current_bbt_points_end);
 
 	if (immediate_redraw) {
 		redraw_measures ();
@@ -138,11 +145,13 @@ Editor::redisplay_tempo (bool immediate_redraw)
 		Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::redraw_measures));
 #endif
 	}
-	update_tempo_based_rulers (); // redraw rulers and measures
+	update_tempo_based_rulers (current_bbt_points_begin, current_bbt_points_end); // redraw rulers and measures
 }
 
 void
-Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
+Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost,
+				    ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+				    ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
 	if (!_session) {
 		return;
@@ -151,7 +160,7 @@ Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
 	/* prevent negative values of leftmost from creeping into tempomap
 	 */
 
-	_session->tempo_map().get_grid (current_bbt_points_begin, current_bbt_points_end, max (leftmost, (framepos_t) 0), rightmost);
+	_session->tempo_map().get_grid (begin, end, max (leftmost, (framepos_t) 0), rightmost);
 }
 
 void
@@ -164,14 +173,20 @@ Editor::hide_measures ()
 bool
 Editor::redraw_measures ()
 {
-	draw_measures ();
+	ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+	ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames(), begin, end);
+        draw_measures (begin, end);
+
 	return false;
 }
 
 void
-Editor::draw_measures ()
+Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+		       ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
-	if (_session == 0 || _show_measures == false || distance (current_bbt_points_begin, current_bbt_points_end) == 0) {
+	if (_session == 0 || _show_measures == false || distance (begin, end) == 0) {
 		return;
 	}
 
@@ -179,7 +194,7 @@ Editor::draw_measures ()
 		tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height(get_window()));
 	}
 
-	tempo_lines->draw (current_bbt_points_begin, current_bbt_points_end, frames_per_unit);
+	tempo_lines->draw (begin, end, frames_per_unit);
 }
 
 void
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index c245ba8843..c554a33f76 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -759,12 +759,11 @@ EngineControl::setup_engine ()
 		error << string_compose (_("cannot open JACK rc file %1 to store parameters"), jackdrc_path) << endmsg;
 		return -1;
 	}
-	cerr << "JACK COMMAND: ";
+
 	for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) {
-		cerr << (*i) << ' ';
 		jackdrc << (*i) << ' ';
 	}
-	cerr << endl;
+
 	jackdrc << endl;
 	jackdrc.close ();
 
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 34113c47a5..9d707678cf 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -27,6 +27,7 @@
 
 #include "export_dialog.h"
 #include "gui_thread.h"
+#include "nag.h"
 
 #include "i18n.h"
 
@@ -331,6 +332,14 @@ ExportDialog::show_progress ()
 	}
 
 	if (!status->aborted()) {
+
+		NagScreen* ns = NagScreen::maybe_nag (_("export"));
+		
+		if (ns) {
+			ns->nag ();
+			delete ns;
+		}
+		
 		status->finish ();
 	}
 }
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 166d29ef2c..fbfd769e1e 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -119,8 +119,8 @@ GainMeterBase::GainMeterBase (Session* s,
 	meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press));
 	meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK);
 
-	gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press));
-	gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release));
+	gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false);
+	gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false);
 	gain_slider->set_name ("GainFader");
 
 	gain_display.set_name ("MixerStripGainDisplay");
@@ -264,9 +264,9 @@ GainMeterBase::setup_gain_adjustment ()
 		_data_type = DataType::MIDI;
 		gain_adjustment.set_lower (0.0);
 		gain_adjustment.set_upper (2.0);
-		gain_adjustment.set_step_increment (0.05);
-		gain_adjustment.set_page_increment (0.1);
-		gain_slider->set_default_value (1);
+		gain_adjustment.set_step_increment (1.0/128.0);
+		gain_adjustment.set_page_increment (10.0/128.0);
+		gain_slider->set_default_value (1.0);
 	}
 
 	ignore_toggle = false;
@@ -396,18 +396,29 @@ GainMeterBase::gain_activated ()
 {
 	float f;
 
-	if (sscanf (gain_display.get_text().c_str(), "%f", &f) == 1) {
+	{
+		// Switch to user's preferred locale so that
+		// if they use different LC_NUMERIC conventions,
+		// we will honor them.
 
-		/* clamp to displayable values */
-
-		f = min (f, 6.0f);
-
-		_amp->set_gain (dB_to_coefficient(f), this);
-
-		if (gain_display.has_focus()) {
-			PublicEditor::instance().reset_focus();
+		PBD::LocaleGuard lg ("");
+		if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
+			return;
 		}
 	}
+
+	/* clamp to displayable values */
+	if (_data_type == DataType::AUDIO) {
+		f = min (f, 6.0f);
+		_amp->set_gain (dB_to_coefficient(f), this);
+	} else {
+		f = min (fabs (f), 2.0f);
+		_amp->set_gain (f, this);
+	}
+
+	if (gain_display.has_focus()) {
+		PublicEditor::instance().reset_focus();
+	}
 }
 
 void
@@ -436,15 +447,14 @@ GainMeterBase::show_gain ()
 void
 GainMeterBase::gain_adjusted ()
 {
-	gain_t value = 0;
+	gain_t value;
 
-	switch (_data_type) {
-	case DataType::AUDIO:
+	/* convert from adjustment range (0..1) to gain coefficient */
+
+	if (_data_type == DataType::AUDIO) {
 		value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
-		break;
-	case DataType::MIDI:
-		value = gain_adjustment.get_value ();
-		break;
+	} else {
+		value = gain_adjustment.get_value();
 	}
 	
 	if (!ignore_toggle) {
@@ -652,14 +662,14 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
 		return false;
 	}
 
-	return true;
+	return false;
 }
 
 bool
 GainMeterBase::gain_slider_button_release (GdkEventButton*)
 {
 	_amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
-	return true;
+	return false;
 }
 
 gint
diff --git a/gtk2_ardour/icons/metronome.png b/gtk2_ardour/icons/metronome.png
index 1a3f170914..6bc3939837 100644
Binary files a/gtk2_ardour/icons/metronome.png and b/gtk2_ardour/icons/metronome.png differ
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index 177d27fa47..839bc6a4b8 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -56,7 +56,7 @@ LV2PluginUI::write_from_ui(void*       controller,
 		if (ac) {
 			ac->set_value(*(const float*)buffer);
 		}
-	} else if (format == me->_lv2->atom_eventTransfer()) {
+	} else if (format == me->_lv2->urids.atom_eventTransfer) {
 
 		const int cnt = me->_pi->get_count();
 		for (int i=0; i < cnt; i++ ) {
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 1c306a6182..face2a9e7c 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -434,7 +434,7 @@ int main (int argc, char *argv[])
 
 	if (no_splash) {
 		cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
-		     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
+		     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker, Robin Gareus") << endl
 		     << endl
 		     << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
 		     <<	_("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index cf00e25839..c9361f6091 100644
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -51,9 +51,15 @@ MainClock::build_ops_menu ()
 	ops_items.push_back (CheckMenuElem (_("Display delta to edit cursor"), sigc::mem_fun (*this, &MainClock::display_delta_to_edit_cursor)));
 	CheckMenuItem* c = dynamic_cast<CheckMenuItem *> (&ops_items.back());
 	if (_primary) {
-		c->set_active (ARDOUR::Config->get_primary_clock_delta_edit_cursor ());
+		if (ARDOUR::Config->get_primary_clock_delta_edit_cursor ()) {
+			ARDOUR::Config->set_primary_clock_delta_edit_cursor (false);
+			c->set_active (true);
+		}
 	} else {
-		c->set_active (ARDOUR::Config->get_secondary_clock_delta_edit_cursor ());
+		if (ARDOUR::Config->get_secondary_clock_delta_edit_cursor ()) {
+			ARDOUR::Config->set_secondary_clock_delta_edit_cursor (false);
+			c->set_active (true);
+		}
 	}
 }
 
diff --git a/gtk2_ardour/mixer.bindings b/gtk2_ardour/mixer.bindings
index 25d4cfb077..bd5ec90458 100644
--- a/gtk2_ardour/mixer.bindings
+++ b/gtk2_ardour/mixer.bindings
@@ -3,6 +3,7 @@
   <Press>
      <Binding key="s" action="Mixer/solo"/>
      <Binding key="m" action="Mixer/mute"/>
+     <Binding key="Secondary-i" action="Mixer/toggle-midi-input-active"/>
      <Binding key="r" action="Mixer/recenable"/>
      <Binding key="0" action="Mixer/unity-gain"/>
      <Binding key="Up" action="Mixer/increment-gain"/>
diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index 6a60fd0bf1..d7a1149a4b 100644
--- a/gtk2_ardour/mixer_actor.cc
+++ b/gtk2_ardour/mixer_actor.cc
@@ -71,6 +71,9 @@ MixerActor::register_actions ()
 
 	myactions.register_action ("Mixer", "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_left));
 	myactions.register_action ("Mixer", "scroll-right", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_right));
+
+	myactions.register_action ("Mixer", "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"), 
+				   sigc::bind (sigc::mem_fun (*this, &MixerActor::toggle_midi_input_active), false));
 }
 
 void
@@ -261,3 +264,4 @@ MixerActor::ab_plugins ()
 		}
 	}
 }
+
diff --git a/gtk2_ardour/mixer_actor.h b/gtk2_ardour/mixer_actor.h
index 85c7bc1cf8..0b856d338c 100644
--- a/gtk2_ardour/mixer_actor.h
+++ b/gtk2_ardour/mixer_actor.h
@@ -63,10 +63,14 @@ class MixerActor : virtual public sigc::trackable
 	void toggle_processors ();
 	void ab_plugins ();
 
+        /* these actions need access to a Session, do defer to
+	   a derived class
+	*/
+        virtual void toggle_midi_input_active (bool flip_others) = 0;
+
 	/* these actions don't apply to the selection, so defer to
 	   a derived class.
 	*/
-
 	virtual void scroll_left () {}
 	virtual void scroll_right () {}
 };
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index c4410438f9..843f2ee452 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -161,7 +161,7 @@ MixerStrip::init ()
 	output_button.set_name ("mixer strip button");
 	Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
 
-	ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
+	ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
 	meter_point_button.set_name ("mixer strip button");
 
 	/* TRANSLATORS: this string should be longest of the strings
@@ -632,8 +632,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 			panners.short_astate_string(_route->panner()->automation_state()));
 		}
 		
-		solo_isolated_led->set_text (_("i"));
-		solo_safe_led->set_text (_("L"));
+		solo_isolated_led->set_text (_("iso"));
+		solo_safe_led->set_text (_("Lck"));
 
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
 		set_size_request (max (50, gpm.get_gm_width()), -1);
@@ -1069,10 +1069,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
 	if (for_input) {
 		io_count = route->n_inputs().n_total();
-		tooltip << string_compose (_("<b>INPUT</b> to %1"), route->name());
+		tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
 	} else {
 		io_count = route->n_outputs().n_total();
-		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), route->name());
+		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
 	}
 
 
@@ -1092,9 +1092,9 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 				string& connection_name (*i);
 
 				if (io_connection_count == 0) {
-					tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name;
+					tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
 				} else {
-					tooltip << ", " << connection_name;
+					tooltip << ", " << Glib::Markup::escape_text(connection_name);
 				}
 
 				if (connection_name.find("ardour:") == 0) {
@@ -1680,28 +1680,58 @@ MixerStrip::engine_running ()
 string
 MixerStrip::meter_point_string (MeterPoint mp)
 {
-	switch (mp) {
-	case MeterInput:
-		return _("in");
+	switch (_width) {
+	case Wide:
+		switch (mp) {
+		case MeterInput:
+			return _("in");
+			break;
+			
+		case MeterPreFader:
+			return _("pre");
+			break;
+			
+		case MeterPostFader:
+			return _("post");
+			break;
+			
+		case MeterOutput:
+			return _("out");
+			break;
+			
+		case MeterCustom:
+		default:
+			return _("custom");
+			break;
+		}
 		break;
-
-	case MeterPreFader:
-		return _("pre");
-		break;
-
-	case MeterPostFader:
-		return _("post");
-		break;
-
-	case MeterOutput:
-		return _("out");
-		break;
-
-	case MeterCustom:
-	default:
-		return _("custom");
+	case Narrow:
+		switch (mp) {
+		case MeterInput:
+			return _("in");
+			break;
+			
+		case MeterPreFader:
+			return _("pr");
+			break;
+			
+		case MeterPostFader:
+			return _("po");
+			break;
+			
+		case MeterOutput:
+			return _("o");
+			break;
+			
+		case MeterCustom:
+		default:
+			return _("c");
+			break;
+		}
 		break;
 	}
+
+	return string();
 }
 
 /** Called when the metering point has changed */
@@ -1884,8 +1914,13 @@ MixerStrip::set_button_names ()
 		break;
 
 	}
-}
 
+	if (_route) {
+		meter_point_button.set_text (meter_point_string (_route->meter_point()));
+	} else {
+		meter_point_button.set_text ("");
+	}
+}
 
 PluginSelector*
 MixerStrip::plugin_selector()
@@ -1915,22 +1950,12 @@ MixerStrip::input_active_button_release (GdkEventButton* ev)
 		return true;
 	}
 
-	if (mt->input_active()) {
-		if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
-			/* turn all other tracks using this input off */
-			_session->set_exclusive_input_active (mt, false);
-		} else {
-			mt->set_input_active (false);
-		}
+	boost::shared_ptr<RouteList> rl (new RouteList);
 
-	} else {
-		if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
-			/* turn all other tracks using this input on */
-			_session->set_exclusive_input_active (mt, true);
-		} else {
-			mt->set_input_active (true);
-		}
-	}
+	rl->push_back (route());
+
+	_session->set_exclusive_input_active (rl, !mt->input_active(),
+					      Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)));
 
 	return true;
 }
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index eb29bdbf97..4a2865c339 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -314,7 +314,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void set_meter_point (ARDOUR::MeterPoint);
 	PBD::ScopedConnection _level_meter_connection;
 
-	static std::string meter_point_string (ARDOUR::MeterPoint);
+	std::string meter_point_string (ARDOUR::MeterPoint);
 };
 
 #endif /* __ardour_mixer_strip__ */
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 468cdf2244..560c37bb1d 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -38,6 +38,7 @@
 #include <gtkmm2ext/window_title.h>
 
 #include "ardour/debug.h"
+#include "ardour/midi_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
@@ -310,9 +311,10 @@ Mixer_UI::add_strips (RouteList& routes)
 {
 	MixerStrip* strip;
 
-	{
-		Unwinder<bool> uw (no_track_list_redisplay, true);
-		
+	try {
+		no_track_list_redisplay = true;
+		track_display.set_model (Glib::RefPtr<ListStore>());
+
 		for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
 			boost::shared_ptr<Route> route = (*x);
 			
@@ -344,7 +346,7 @@ Mixer_UI::add_strips (RouteList& routes)
 			
 			strip = new MixerStrip (*this, _session, route);
 			strips.push_back (strip);
-			
+
 			Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
 			
 			if (strip->width_owner() != strip) {
@@ -364,8 +366,13 @@ Mixer_UI::add_strips (RouteList& routes)
 			strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
 			strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
 		}
+
+	} catch (...) {
 	}
 
+	no_track_list_redisplay = false;
+	track_display.set_model (track_model);
+	
 	sync_order_keys_from_treeview ();
 	redisplay_track_list ();
 }
@@ -1888,7 +1895,7 @@ Mixer_UI::set_route_targets_for_operation ()
 		return;
 	}
 
-	/* try to get mixer strip at mouse */
+	/* nothing selected ... try to get mixer strip at mouse */
 
 	int x, y;
 	get_pointer (x, y);
@@ -1908,3 +1915,23 @@ Mixer_UI::monitor_section_going_away ()
 		_monitor_section->set_session (0);
 	}
 }
+
+void
+Mixer_UI::toggle_midi_input_active (bool flip_others)
+{
+	boost::shared_ptr<RouteList> rl (new RouteList);
+	bool onoff;
+
+	set_route_targets_for_operation ();
+
+	for (RouteUISelection::iterator r = _route_targets.begin(); r != _route_targets.end(); ++r) {
+		boost::shared_ptr<MidiTrack> mt = (*r)->midi_track();
+
+		if (mt) {
+			rl->push_back ((*r)->route());
+			onoff = !mt->input_active();
+		}
+	}
+	
+	_session->set_exclusive_input_active (rl, onoff, flip_others);
+}
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index ef35d97d3c..c253841768 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -129,6 +129,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	bool strip_scroller_button_release (GdkEventButton*);
 	void scroll_left ();
 	void scroll_right ();
+        void toggle_midi_input_active (bool flip_others);
 
 	void add_strips (ARDOUR::RouteList&);
 	void remove_strip (MixerStrip *);
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index d37a47211f..7ef94f726b 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -92,20 +92,20 @@ This mode provides many different operations on both regions and control points,
 
 @vis|Editor/temporal-zoom-in|equal|zoom in
 @vis|Editor/temporal-zoom-out|minus|zoom out
-@eep|Editor/edit-cursor-to-previous-region-sync|apostrophe|EP to previous region sync
+@eep|Editor/edit-cursor-to-previous-region-sync|apostrophe|EP to prev region sync
 @eep|Editor/edit-cursor-to-next-region-sync|semicolon|EP to next region sync
 @eep|Editor/cycle-edit-point|grave|next EP w/o marker
 @eep|Editor/cycle-edit-point-with-marker|<@PRIMARY@>asciicircum|next EP w/marker
 
-@aep|Editor/move-range-start-to-previous-region-boundary|less|move range start to previous region boundary
-@aep|Editor/move-range-start-to-next-region-boundary|<@PRIMARY@>less|move range start to next region boundary
-@aep|Editor/move-range-end-to-previous-region-boundary|<@PRIMARY@>greater|move range end to next previous boundary
-@aep|Editor/move-range-end-to-next-region-boundary|greater|move range end to next region boundary
+@aep|Editor/move-range-start-to-previous-region-boundary|less|range start to prev region edge
+@aep|Editor/move-range-start-to-next-region-boundary|<@PRIMARY@>less|range start to next region edge
+@aep|Editor/move-range-end-to-previous-region-boundary|<@PRIMARY@>greater|range end to next prev edge
+@aep|Editor/move-range-end-to-next-region-boundary|greater|range end to next region edge
 
 @trans|Transport/ToggleRoll|space|toggle roll
 @epp|Editor/play-edit-range|<@SECONDARY@>space|play edit range
 @epp|Editor/play-from-edit-point-and-return|<@LEVEL4@>space|play from EP \& return
-@trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY@>space|stop but do not leave loop/range play
+@trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY@>space|stop (keep loop/range play)
 @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy
 @trans|Transport/record-roll|<@TERTIARY@>space|start recording
 
@@ -117,7 +117,7 @@ This mode provides many different operations on both regions and control points,
 @eep|Region/trim-from-start|<@TERTIARY@>braceleft|trim region start to edit point
 @eep|Region/trim-to-end|<@TERTIARY@>braceright|trim region end to edit point
 
-@eep|Editor/trim-to-previous-region|<@PRIMARY@>j|trim region to end of previous region
+@eep|Editor/trim-to-previous-region|<@PRIMARY@>j|trim region to end of prev region
 @eep|Editor/trim-to-next-region|<@PRIMARY@>k|trim region to start of next region
 
 @ranges|Editor/set-loop-from-edit-range|bracketright|set loop range from edit range
@@ -133,7 +133,7 @@ This mode provides many different operations on both regions and control points,
 ;; TOP ROW
 
 @sess|Common/Quit|<@PRIMARY@>q|quit
-@rop|Region/quantize-region|q|quantize MIDI notes in selected region(s)
+@rop|Region/quantize-region|q|quantize MIDI notes \linebreak[4] in selected region(s)
 
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
@@ -157,6 +157,7 @@ This mode provides many different operations on both regions and control points,
 @eep|Region/insert-region-from-region-list|i|insert from region list
 @select|Editor/invert-selection|<@TERTIARY@>i|invert selection
 @sess|Editor/addExistingAudioFiles|<@PRIMARY@>i|import audio files
+@sess|Editor/toggle-midi-input-active|<@SECONDARY@>i|toggle sel. track MIDI input
 @mmode|MouseMode/set-mouse-mode-object|o|object mode
 @sess|Main/Open|<@PRIMARY@>o|open an existing session
 @sess|Main/Recent|<@PRIMARY@><@TERTIARY@>o|open a recent session
@@ -182,12 +183,15 @@ This mode provides many different operations on both regions and control points,
 @sess|Common/Save|<@PRIMARY@>s|save session
 @sess|Main/Snapshot|<@PRIMARY@><@TERTIARY@>s|snapshot session
 @trans|Editor/track-solo-toggle|<@SECONDARY@>s|toggle track solo status
+@-group|Editor/editor-separate|<@PRIMARY@><@SECONDARY@>s|some text
 @mmode|MouseMode/set-mouse-mode-draw|d|note-draw mode
 @rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once)
 @rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi)
 @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range
 @vis|Editor/fit-tracks|f|fit tracks vertically
 @trans|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking
+@trans|Transport/ToggleFollowEdits|<@TERTIARY@>f|toggle playhead follows edits
+@wvis|Common/ToggleMaximalEditor|<@PRIMARY@><@SECONDARY@>f|maximise editor space
 @wvis|Region/show-rhythm-ferret|<@WINDOW@>f|show rhythm ferret window 
 @mmode|MouseMode/set-mouse-mode-gain|g|region gain mode
 @epp|Region/play-selected-regions|h|play selected region(s)
@@ -198,7 +202,7 @@ This mode provides many different operations on both regions and control points,
 @select|Editor/select-all-in-loop-range|<@PRIMARY@>l|select all in loop range
 @wvis|Common/ToggleLocations|<@WINDOW@>l| toggle locations dialog
 
-;; HOME ROW
+;; BOTTOM ROW
 
 @mmode|MouseMode/set-mouse-mode-zoom|z|zoom mode
 @edit|Editor/undo|<@PRIMARY@>z|undo
@@ -206,12 +210,13 @@ This mode provides many different operations on both regions and control points,
 @vis|Editor/zoom-to-region-both-axes|<@SECONDARY@>z|zoom (x+y) to selected region
 @vis|Editor/toggle-zoom|<@TERTIARY@>z|toggle last 2 zoom states
 @edit|Editor/editor-cut|<@PRIMARY@>x|cut
+@-group|Editor/crop|c|some text
 @edit|Editor/editor-copy|<@PRIMARY@>c|copy
 @wvis|Common/ToggleColorManager|<@WINDOW@>c|toggle color manager
 @rop|Region/set-region-sync-position|v|set region sync point
 @edit|Editor/editor-paste|<@PRIMARY@>v|paste
 @-group|Editor/brush-at-mouse|<@PRIMARY@>b|some text
-@trans|Editor/track-record-enable-toggle|<@SECONDARY@>b|toggle track rec-enable 
+@trans|Editor/track-record-enable-toggle|<@TERTIARY@>b|toggle track rec-enable 
 @wvis|Common/ToggleBigClock|<@WINDOW@>b|toggle big clock
 @rop|Region/normalize-region|n|normalize
 @sess|Main/AddTrackBus|<@PRIMARY@><@TERTIARY@>n|add track(s) or bus(ses)
@@ -232,16 +237,16 @@ This mode provides many different operations on both regions and control points,
 @vis|Editor/move-selected-tracks-down|<@PRIMARY@>downarrow|move selected tracks down
 
 @movp|Editor/playhead-to-previous-region-boundary|leftarrow|to previous region edge
-@movp|Editor/playhead-to-previous-region-boundary-noselection|<@LEVEL4@>leftarrow|to previous edge \linebreak[4] (ignore selection)
+@movp|Editor/playhead-to-previous-region-boundary-noselection|<@LEVEL4@>leftarrow|to previous edge \linebreak[4] (ignoring selection)
 @movp|Editor/playhead-to-previous-region-sync|<@PRIMARY@><@SECONDARY@>leftarrow|to previous region sync
 @movp|Editor/tab-to-transient-backwards|<@PRIMARY@>leftarrow|to previous transient
 @movp|Editor/nudge-playhead-backward|<@SECONDARY@>leftarrow|nudge backward
 @movp|Editor/playhead-backward-to-grid|<@TERTIARY@><@LEVEL4@>leftarrow|to previous grid point
 @trans|Transport/Rewind|<@TERTIARY@>leftarrow|rewind
-@markers|Editor/selected-marker-to-previous-region-boundary|<@PRIMARY@><@TERTIARY@>leftarrow|move to prev. region edge
+@markers|Editor/selected-marker-to-previous-region-boundary|<@PRIMARY@><@TERTIARY@>leftarrow|move to prev region edge
 
 @movp|Editor/playhead-to-next-region-boundary|rightarrow|to next region edge
-@movp|Editor/playhead-to-next-region-boundary-noselection|<@LEVEL4@>rightarrow|to next region edge \linebreak[4] (ignore selection)
+@movp|Editor/playhead-to-next-region-boundary-noselection|<@LEVEL4@>rightarrow|to next region edge \linebreak[4] (ignoring selection)
 @movp|Editor/playhead-to-next-region-sync|<@PRIMARY@><@SECONDARY@>rightarrow|to next region sync
 @movp|Editor/tab-to-transient-forwards|<@PRIMARY@>rightarrow|to next transient
 @movp|Editor/nudge-playhead-forward|<@SECONDARY@>rightarrow|nudge forwards
@@ -295,11 +300,8 @@ This mode provides many different operations on both regions and control points,
 
 @-group|Editor/edit-cursor-to-range-start|F1|some text
 @-group|Editor/edit-cursor-to-range-end|F2|some text
-@-group|Editor/crop|F3|some text
-@-group|Editor/editor-separate|F4|some text
 @-group|Editor/pitch-shift-region|F5|some text
 @select|Editor/select-range-between-cursors|F6|convert edit range to range
-@wvis|Common/ToggleMaximalEditor|F11|toggle fullscreen editor window
 
 @-group|Editor/save-visual-state-1|<@PRIMARY@>F1|some text
 @-group|Editor/save-visual-state-2|<@PRIMARY@>F2|some text
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index a6fcc734c5..da4594e6da 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -25,6 +25,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/utils.h"
 #include "ardour/dB.h"
+#include "ardour/session.h"
 
 #include "option_editor.h"
 #include "gui_thread.h"
@@ -284,7 +285,7 @@ FaderOption::add_to_page (OptionEditorPage* p)
 	add_widgets_to_page (p, &_label, &_box);
 }
 
-ClockOption::ClockOption (string const & i, string const & n, sigc::slot<framecnt_t> g, sigc::slot<bool, framecnt_t> s)
+ClockOption::ClockOption (string const & i, string const & n, sigc::slot<std::string> g, sigc::slot<bool, std::string> s)
 	: Option (i, n)
 	, _clock (X_("timecode-offset"), false, X_(""), true, false, true, false)
 	, _get (g)
@@ -293,12 +294,30 @@ ClockOption::ClockOption (string const & i, string const & n, sigc::slot<framecn
 	_label.set_text (n + ":");
 	_label.set_alignment (0, 0.5);
 	_label.set_name (X_("OptionsLabel"));
+	_clock.ValueChanged.connect (sigc::mem_fun (*this, &ClockOption::save_clock_time));
 }
 
 void
 ClockOption::set_state_from_config ()
 {
-	_clock.set (_get ());
+	Timecode::Time TC;
+	framepos_t when;
+	if (!Timecode::parse_timecode_format(_get(), TC)) {
+		_clock.set (0, true);
+	}
+	TC.rate = _session->frames_per_timecode_frame();
+	TC.drop = _session->timecode_drop_frames();
+	_session->timecode_to_sample(TC, when, false, false);
+	if (TC.negative) { when=-when; }
+	_clock.set (when, true);
+}
+
+void
+ClockOption::save_clock_time ()
+{
+	Timecode::Time TC;
+	_session->sample_to_timecode(_clock.current_time(), TC, false, false);
+	_set (Timecode::timecode_format_time(TC));
 }
 
 void
@@ -310,6 +329,7 @@ ClockOption::add_to_page (OptionEditorPage* p)
 void
 ClockOption::set_session (Session* s)
 {
+	_session = s;
 	_clock.set_session (s);
 }
 
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 07c11ac8b4..5fbed4ea32 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -535,18 +535,21 @@ private:
 class ClockOption : public Option
 {
 public:
-	ClockOption (std::string const &, std::string const &, sigc::slot<ARDOUR::framecnt_t>, sigc::slot<bool, ARDOUR::framecnt_t>);
+	ClockOption (std::string const &, std::string const &, sigc::slot<std::string>, sigc::slot<bool, std::string>);
 	void set_state_from_config ();
 	void add_to_page (OptionEditorPage *);
 	void set_session (ARDOUR::Session *);
 
         Gtk::Widget& tip_widget() { return _clock; }
+        AudioClock& clock() { return _clock; }
 
 private:
+	void save_clock_time ();
 	Gtk::Label _label;
 	AudioClock _clock;
-	sigc::slot<ARDOUR::framecnt_t> _get;
-	sigc::slot<bool, ARDOUR::framecnt_t> _set;
+	sigc::slot<std::string> _get;
+	sigc::slot<bool, std::string> _set;
+	ARDOUR::Session *_session;
 };
 
 class DirectoryOption : public Option
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 07e9d96385..a7fc024a8f 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -305,10 +305,9 @@ PatchChangeDialog::patch_combo_changed ()
 	for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
 		string n = (*j)->name ();
 		boost::replace_all (n, "_", " ");
-		std::cerr << "Looking for " << n << " vs " << _patch_combo.get_active_text() << std::endl;
+
 		if (n == _patch_combo.get_active_text ()) {
 			_ignore_signals = true;
-			std::cerr << " reset pgm number to " << (int) (*j)->program_number() << std::endl;
 			_program.set_value ((*j)->program_number() + 1);
 			_ignore_signals = false;
 			break;
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 2acdf7d967..c249510863 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -180,7 +180,9 @@ void
 PluginUIWindow::on_map ()
 {
 	Window::on_map ();
+#ifdef __APPLE__
 	set_keep_above (true);
+#endif // __APPLE__
 }
 
 bool
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 2cb561172e..70e479363e 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -1893,7 +1893,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 		}
 
 		catch (...) {
-			cerr << "plugin insert constructor failed\n";
+			error << _("plugin insert constructor failed") << endmsg;
 		}
 	}
 
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index b5d2cd7b6e..21db5c8e22 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -210,10 +210,14 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void track_mixer_selection () = 0;
 	virtual bool extend_selection_to_track (TimeAxisView&) = 0;
 	virtual void play_selection () = 0;
+	virtual void play_with_preroll () = 0;
+	virtual void maybe_locate_with_edit_preroll (framepos_t location) = 0;
 	virtual void set_show_measures (bool yn) = 0;
 	virtual bool show_measures () const = 0;
 	virtual bool redraw_measures () = 0;
 
+	virtual Editing::MouseMode effective_mouse_mode () const = 0;
+
 	/** Open main export dialog */
 	virtual void export_audio () = 0;
 
@@ -390,6 +394,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual MouseCursors const * cursors () const = 0;
 	virtual VerboseCursor * verbose_cursor () const = 0;
 
+	virtual bool get_smart_mode () const = 0;
+
 	virtual void get_pointer_position (double &, double &) const = 0;
 
 	virtual ARDOUR::Location* find_location_from_marker (Marker *, bool &) const = 0;
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index c59c3c949e..0b6ed5c45f 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -881,6 +881,7 @@ RCOptionEditor::RCOptionEditor ()
 	/* MISC */
 
         uint32_t hwcpus = hardware_concurrency ();
+	BoolOption* bo;
 
         if (hwcpus > 1) {
                 add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
@@ -973,6 +974,15 @@ RCOptionEditor::RCOptionEditor ()
 		     0, 1000, 1, 20
 		     ));
 
+	add_option (_("Misc"),
+	     new SpinOption<double> (
+		     "automation-interval-msecs",
+		     _("Automation sampling interval (milliseconds)"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
+		     1, 1000, 1, 20
+		     ));
+
 	/* TRANSPORT */
 
 	BoolOption* tsf;
@@ -1105,6 +1115,8 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Transport"), _sync_source_2997);
 
+	add_option (_("Transport"), new OptionEditorHeading (S_("LTC Reader")));
+
 	_ltc_port = new ComboStringOption (
 		"ltc-source-port",
 		_("LTC incoming port"),
@@ -1152,10 +1164,10 @@ RCOptionEditor::RCOptionEditor ()
 		 _("Specify the Peak Volume of the generated LTC signal in dbFS. A good value is  0dBu ^= -18dbFS in an EBU calibrated system"));
 
 	add_option (_("Transport"), _ltc_volume_slider);
+	parameter_changed ("send-ltc");
 #endif
 
 	parameter_changed ("sync-source");
-	parameter_changed ("send-ltc");
 
 	/* EDITOR */
 
@@ -1183,13 +1195,19 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
 		     ));
 
-	add_option (_("Editor"),
-	     new BoolOption (
+	bo = new BoolOption (
 		     "use-overlap-equivalency",
 		     _("Use overlap equivalency for regions"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
-		     ));
+		     );
+
+	add_option (_("Editor"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), 
+					    string_compose (_("When extending region selection across a group, %1 must decide which regions are equivalent"
+							      "\n\nIf enabled, regions are considered \"equivalent\" if they overlap on the timeline."
+							      "\n\nIf disabled, regions are considered \"equivalent\" only if have the same start time, length and position"),
+							    PROGRAM_NAME));
 
 	add_option (_("Editor"),
 	     new BoolOption (
@@ -1289,13 +1307,16 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_editor_and_mixer_selection)
 		     ));
 
-	add_option (_("Editor"),
-	     new BoolOption (
+	bo = new BoolOption (
 		     "name-new-markers",
 		     _("Name new markers"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
-		     ));
+		);
+	
+	add_option (_("Editor"), bo);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
+								"\n\nYou can always rename markers by right-clicking on them"));
 
 	add_option (_("Editor"),
 	    new BoolOption (
@@ -1707,6 +1728,14 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
 		     ));
 
+	add_option (S_("GUI"),
+	     new BoolOption (
+		     "use-tooltips",
+		     _("Show tooltips if mouse hovers over a control"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_tooltips),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_tooltips)
+		     ));
+
 #ifndef GTKOSX
 	/* font scaling does nothing with GDK/Quartz */
 	add_option (S_("GUI"), new FontScalingOptions (_rc_config));
@@ -1795,6 +1824,10 @@ RCOptionEditor::parameter_changed (string const & p)
 		_solo_control_is_listen_control->set_sensitive (s);
 		_listen_position->set_sensitive (s);
 	} else if (p == "sync-source") {
+		_sync_source->set_sensitive (true);
+		if (_session) {
+			_sync_source->set_sensitive (_session->config.get_external_sync());
+		}
 		switch(Config->get_sync_source()) {
 		case ARDOUR::MTC:
 		case ARDOUR::LTC:
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 12f5c45abb..aca8b523a1 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -38,7 +38,7 @@ class AudioRegionGainLine : public AutomationLine
   public:
 	AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
 
-	void start_drag_single (ControlPoint*, double, float);
+        void start_drag_single (ControlPoint*, double, float);
 	void end_drag ();
 
 	void remove_point (ControlPoint&);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index fa909dfe57..3ba36ea6aa 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -348,7 +348,7 @@ RouteTimeAxisView::label_view ()
 		name_label.set_text (x);
 	}
 
-	ARDOUR_UI::instance()->set_tip (name_entry, x);
+	ARDOUR_UI::instance()->set_tip (name_entry, Glib::Markup::escape_text(x));
 }
 
 void
@@ -414,10 +414,13 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection)
 	items.push_back (SeparatorElem ());
 
 	/* Attach the plugin submenu. It may have previously been used elsewhere,
-	   so it was detached above */
-
-	items.push_back (MenuElem (_("Plugins"), subplugin_menu));
-	items.back().set_sensitive (!subplugin_menu.items().empty() && (!for_selection || _editor.get_selection().tracks.size() == 1));;
+	   so it was detached above 
+	*/
+	
+	if (!subplugin_menu.items().empty()) {
+		items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+		items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);;
+	}
 }
 
 void
@@ -1598,7 +1601,9 @@ RouteTimeAxisView::update_playlist_tip ()
 			/* set the playlist button tooltip to the take name */
 			ARDOUR_UI::instance()->set_tip (
 				playlist_button,
-				string_compose(_("Take: %1.%2"), escape_angled_brackets (rg->name()), escape_angled_brackets (take_name))
+				string_compose(_("Take: %1.%2"),
+					Glib::Markup::escape_text(rg->name()),
+					Glib::Markup::escape_text(take_name))
 				);
 			
 			return;
@@ -1606,7 +1611,7 @@ RouteTimeAxisView::update_playlist_tip ()
 	}
 
 	/* set the playlist button tooltip to the playlist name */
-	ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + escape_angled_brackets (track()->playlist()->name()));
+	ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name()));
 }
 
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 536b4f110b..c264588b2b 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1738,12 +1738,23 @@ RouteUI::open_remote_control_id_dialog ()
 		dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT);
 	} else {
 		Label* l = manage (new Label());
-		l->set_markup (string_compose (_("Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
-						 "This %2 has remote control ID %3\n\n\n"
-						 "<span size=\"small\" style=\"italic\">Use the User Interaction tab of the Preferences window if you want to change this</span>"),
-					       (Config->get_remote_model() == MixerOrdered ? _("the mixer") : ("the editor")),
-					       (is_track() ? _("track") : _("bus")),
-					       _route->remote_control_id()));
+		if (_route->is_master() || _route->is_monitor()) {
+			l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n"
+							 "The remote control ID of %3 cannot be changed."),
+						       Glib::Markup::escape_text (_route->name()),
+						       _route->remote_control_id(),
+						       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
+		} else {
+			l->set_markup (string_compose (_("The remote control ID of %6 is: %3\n\n\n"
+							 "Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
+							 "%4Use the User Interaction tab of the Preferences window if you want to change this%5"),
+						       (Config->get_remote_model() == MixerOrdered ? _("the mixer") : ("the editor")),
+						       (is_track() ? _("track") : _("bus")),
+						       _route->remote_control_id(),
+						       "<span size=\"small\" style=\"italic\">",
+						       "</span>",
+						       Glib::Markup::escape_text (_route->name())));
+		}
 		dialog.get_vbox()->pack_start (*l);
 		dialog.add_button (Stock::OK, RESPONSE_CANCEL);
 	}
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 009b40d26d..395ceda169 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -110,6 +110,37 @@ Selection::clear ()
 	clear_markers ();
 }
 
+void
+Selection::clear_objects ()
+{
+	clear_regions ();
+	clear_points ();
+	clear_lines();
+	clear_playlists ();
+	clear_midi_notes ();
+	clear_midi_regions ();
+	clear_markers ();
+}
+
+void
+Selection::clear_tracks ()
+{
+	if (!tracks.empty()) {
+		tracks.clear ();
+		if (!_no_tracks_changed) {
+			TracksChanged();
+		}
+	}
+}
+
+void
+Selection::clear_time ()
+{
+	time.clear();
+
+	TimeChanged ();
+}
+
 void
 Selection::dump_region_layers()
 {
@@ -132,17 +163,6 @@ Selection::clear_regions ()
 	}
 }
 
-void
-Selection::clear_tracks ()
-{
-	if (!tracks.empty()) {
-		tracks.clear ();
-		if (!_no_tracks_changed) {
-			TracksChanged();
-		}
-	}
-}
-
 void
 Selection::clear_midi_notes ()
 {
@@ -164,14 +184,6 @@ Selection::clear_midi_regions ()
 	}
 }
 
-void
-Selection::clear_time ()
-{
-	time.clear();
-
-	TimeChanged ();
-}
-
 void
 Selection::clear_playlists ()
 {
@@ -210,6 +222,8 @@ Selection::clear_markers ()
 void
 Selection::toggle (boost::shared_ptr<Playlist> pl)
 {
+	clear_time();  //enforce object/range exclusivity
+	
 	PlaylistSelection::iterator i;
 
 	if ((i = find (playlists.begin(), playlists.end(), pl)) == playlists.end()) {
@@ -249,6 +263,8 @@ Selection::toggle (TimeAxisView* track)
 void
 Selection::toggle (const MidiNoteSelection& midi_note_list)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) {
 		toggle ((*i));
 	}
@@ -274,6 +290,8 @@ Selection::toggle (MidiCutBuffer* midi)
 void
 Selection::toggle (RegionView* r)
 {
+	clear_time();  //enforce object/range exclusivity
+	
 	RegionSelection::iterator i;
 
 	if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) {
@@ -288,6 +306,8 @@ Selection::toggle (RegionView* r)
 void
 Selection::toggle (MidiRegionView* mrv)
 {
+	clear_time();   //enforce object/range exclusivity
+
 	MidiRegionSelection::iterator i;
 
 	if ((i = find (midi_regions.begin(), midi_regions.end(), mrv)) == midi_regions.end()) {
@@ -302,6 +322,8 @@ Selection::toggle (MidiRegionView* mrv)
 void
 Selection::toggle (vector<RegionView*>& r)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	RegionSelection::iterator i;
 
 	for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) {
@@ -318,6 +340,8 @@ Selection::toggle (vector<RegionView*>& r)
 long
 Selection::toggle (framepos_t start, framepos_t end)
 {
+	clear_objects();  //enforce object/range exclusivity
+
 	AudioRangeComparator cmp;
 
 	/* XXX this implementation is incorrect */
@@ -334,6 +358,8 @@ Selection::toggle (framepos_t start, framepos_t end)
 void
 Selection::add (boost::shared_ptr<Playlist> pl)
 {
+	clear_time();  //enforce object/range exclusivity
+	
 	if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) {
 		pl->use ();
 		playlists.push_back(pl);
@@ -344,6 +370,8 @@ Selection::add (boost::shared_ptr<Playlist> pl)
 void
 Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
 {
+	clear_time();  //enforce object/range exclusivity
+	
 	bool changed = false;
 
 	for (list<boost::shared_ptr<Playlist> >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) {
@@ -382,6 +410,8 @@ Selection::add (TimeAxisView* track)
 void
 Selection::add (const MidiNoteSelection& midi_list)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	const MidiNoteSelection::const_iterator b = midi_list.begin();
 	const MidiNoteSelection::const_iterator e = midi_list.end();
 
@@ -405,6 +435,8 @@ Selection::add (MidiCutBuffer* midi)
 void
 Selection::add (vector<RegionView*>& v)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	/* XXX This method or the add (const RegionSelection&) needs to go
 	 */
 
@@ -427,6 +459,8 @@ Selection::add (vector<RegionView*>& v)
 void
 Selection::add (const RegionSelection& rs)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	/* XXX This method or the add (const vector<RegionView*>&) needs to go
 	 */
 
@@ -449,6 +483,8 @@ Selection::add (const RegionSelection& rs)
 void
 Selection::add (RegionView* r)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	if (find (regions.begin(), regions.end(), r) == regions.end()) {
 		bool changed = regions.add (r);
                 if (Config->get_link_region_and_track_selection() && changed) {
@@ -463,6 +499,8 @@ Selection::add (RegionView* r)
 void
 Selection::add (MidiRegionView* mrv)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	if (find (midi_regions.begin(), midi_regions.end(), mrv) == midi_regions.end()) {
 		midi_regions.push_back (mrv);
 		/* XXX should we do this? */
@@ -478,6 +516,8 @@ Selection::add (MidiRegionView* mrv)
 long
 Selection::add (framepos_t start, framepos_t end)
 {
+	clear_objects();  //enforce object/range exclusivity
+
 	AudioRangeComparator cmp;
 
 	/* XXX this implementation is incorrect */
@@ -494,6 +534,8 @@ Selection::add (framepos_t start, framepos_t end)
 void
 Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
 {
+	clear_objects();  //enforce object/range exclusivity
+	
 	for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
 		if ((*i).id == sid) {
 			time.erase (i);
@@ -514,6 +556,8 @@ Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
 void
 Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
 {
+	clear_time();  //enforce object/range exclusivity
+
 	boost::shared_ptr<ARDOUR::AutomationList> al
 		= boost::dynamic_pointer_cast<ARDOUR::AutomationList>(cl);
 	if (!al) {
@@ -711,28 +755,32 @@ Selection::set (const TrackViewList& track_list)
 void
 Selection::set (const MidiNoteSelection& midi_list)
 {
-	clear_midi_notes ();
+	clear_time ();  //enforce region/object exclusivity
+	clear_objects ();
 	add (midi_list);
 }
 
 void
 Selection::set (boost::shared_ptr<Playlist> playlist)
 {
-	clear_playlists ();
+	clear_time ();  //enforce region/object exclusivity
+	clear_objects ();
 	add (playlist);
 }
 
 void
 Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
 {
-	clear_playlists ();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects ();
 	add (pllist);
 }
 
 void
 Selection::set (const RegionSelection& rs)
 {
-	clear_regions();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects();
 	regions = rs;
 	RegionsChanged(); /* EMIT SIGNAL */
 }
@@ -740,14 +788,16 @@ Selection::set (const RegionSelection& rs)
 void
 Selection::set (MidiRegionView* mrv)
 {
-	clear_midi_regions ();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects ();
 	add (mrv);
 }
 
 void
 Selection::set (RegionView* r, bool also_clear_tracks)
 {
-	clear_regions ();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects ();
 	if (also_clear_tracks && !Config->get_link_region_and_track_selection()) {
 		/* clear_regions() will have done this if the link preference
 		 * is enabled
@@ -762,7 +812,8 @@ Selection::set (vector<RegionView*>& v)
 {
 	bool had_regions = !regions.empty();
 
-	clear_regions ();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects();
 
 	if (Config->get_link_region_and_track_selection()) {
 		if (had_regions) {
@@ -785,6 +836,9 @@ Selection::set (vector<RegionView*>& v)
 long
 Selection::set (framepos_t start, framepos_t end)
 {
+	clear_objects();  //enforce region/object exclusivity
+	clear_time();
+
 	if ((start == 0 && end == 0) || end < start) {
 		return 0;
 	}
@@ -819,6 +873,8 @@ Selection::set (framepos_t start, framepos_t end)
 void
 Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
 {
+	clear_objects();  //enforce region/object exclusivity
+
 	if ((start == 0 && end == 0) || (end < start)) {
 		return;
 	}
@@ -839,7 +895,9 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
 void
 Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 {
-	lines.clear();
+	clear_time();  //enforce region/object exclusivity
+	clear_objects();
+	
 	add (ac);
 }
 
@@ -895,6 +953,8 @@ Selection::empty (bool internal_selection)
 void
 Selection::toggle (ControlPoint* cp)
 {
+	clear_time();  //enforce region/object exclusivity
+
 	cp->set_selected (!cp->get_selected ());
 	PointSelection::iterator i = find (points.begin(), points.end(), cp);
 	if (i == points.end()) {
@@ -909,6 +969,8 @@ Selection::toggle (ControlPoint* cp)
 void
 Selection::toggle (vector<ControlPoint*> const & cps)
 {
+	clear_time();  //enforce region/object exclusivity
+
 	for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
 		toggle (*i);
 	}
@@ -917,6 +979,8 @@ Selection::toggle (vector<ControlPoint*> const & cps)
 void
 Selection::toggle (list<Selectable*> const & selectables)
 {
+	clear_time();  //enforce region/object exclusivity
+	
 	RegionView* rv;
 	ControlPoint* cp;
 	vector<RegionView*> rvs;
@@ -947,8 +1011,8 @@ Selection::toggle (list<Selectable*> const & selectables)
 void
 Selection::set (list<Selectable*> const & selectables)
 {
-	clear_regions();
-	clear_points ();
+	clear_time ();  //enforce region/object exclusivity
+	clear_objects ();
 
 	if (Config->get_link_region_and_track_selection ()) {
 		clear_tracks ();
@@ -960,6 +1024,8 @@ Selection::set (list<Selectable*> const & selectables)
 void
 Selection::add (PointSelection const & s)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
 		points.push_back (*i);
 	}
@@ -968,6 +1034,8 @@ Selection::add (PointSelection const & s)
 void
 Selection::add (list<Selectable*> const & selectables)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	RegionView* rv;
 	ControlPoint* cp;
 	vector<RegionView*> rvs;
@@ -1007,6 +1075,8 @@ Selection::clear_points ()
 void
 Selection::add (ControlPoint* cp)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	cp->set_selected (true);
 	points.push_back (cp);
 	PointsChanged (); /* EMIT SIGNAL */
@@ -1015,14 +1085,20 @@ Selection::add (ControlPoint* cp)
 void
 Selection::add (vector<ControlPoint*> const & cps)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
-		add (*i);
+		(*i)->set_selected (true);
+		points.push_back (*i);
 	}
+	PointsChanged (); /* EMIT SIGNAL */
 }
 
 void
 Selection::set (ControlPoint* cp)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	if (cp->get_selected()) {
 		return;
 	}
@@ -1031,20 +1107,24 @@ Selection::set (ControlPoint* cp)
 		cp->line().nth (i)->set_selected (false);
 	}
 
-	clear_points ();
+	clear_objects ();
 	add (cp);
 }
 
 void
 Selection::set (Marker* m)
 {
-	clear_markers ();
+	clear_time ();  //enforce region/object exclusivity
+	clear_objects();
+
 	add (m);
 }
 
 void
 Selection::toggle (Marker* m)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	MarkerSelection::iterator i;
 
 	if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) {
@@ -1068,6 +1148,8 @@ Selection::remove (Marker* m)
 void
 Selection::add (Marker* m)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	if (find (markers.begin(), markers.end(), m) == markers.end()) {
 		markers.push_back (m);
 		MarkersChanged();
@@ -1077,6 +1159,8 @@ Selection::add (Marker* m)
 void
 Selection::add (const list<Marker*>& m)
 {
+	clear_time ();  //enforce region/object exclusivity
+
 	markers.insert (markers.end(), m.begin(), m.end());
 	markers.sort ();
 	markers.unique ();
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index e30ca612ea..73acaaa7c0 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -186,9 +186,22 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 
 	void replace (uint32_t time_index, framepos_t start, framepos_t end);
 
+/*
+ * A note about items in an editing Selection:
+ * At a high level, selections can include Tracks, Objects, or Time Ranges
+ * Range and Object selections are mutually exclusive.
+ * Selecting a Range will deselect all Objects, and vice versa.
+ * This is done to avoid confusion over what will happen in an operation such as Delete
+ * Tracks are somewhat orthogonal b/c editing operations don't apply to tracks.
+ * The Track selection isn't affected when ranges or objects are added.
+ */
+
+	void clear_time();  //clears any time selection  ( i.e. Range )
+	void clear_tracks ();  //clears the track header selections
+	void clear_objects();  //clears the items listed below
+
+	// these items get cleared wholesale in clear_objects
 	void clear_regions();
-	void clear_tracks ();
-	void clear_time();
 	void clear_lines ();
 	void clear_playlists ();
 	void clear_points ();
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 1184a89cf5..67d04faa9e 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -24,6 +24,7 @@
 #include <gtkmm2ext/utils.h>
 
 #include "pbd/xml++.h"
+#include "pbd/error.h"
 
 #include "ardour/session.h"
 #include "ardour/session_utils.h"
@@ -32,6 +33,7 @@
 
 using namespace std;
 using namespace Glib;
+using namespace PBD;
 
 #define CALL_MEMBER_FN(object,ptrToMember)  ((object).*(ptrToMember))
 
@@ -326,7 +328,7 @@ void
 SessionMetadataSetImportable::load_extra_data (ARDOUR::SessionMetadata const & data)
 {
 	if (!_session) {
-		std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in load_data)!" << std::endl;
+		error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataSetImportable (in load_data)!") << endmsg;
 		return;
 	}
 
@@ -374,7 +376,7 @@ void
 SessionMetadataSetImportable::save_data ()
 {
 	if (!_session) {
-		std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in import_data)!" << std::endl;
+		error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataSetImportable (in import_data)!") << endmsg;
 		return;
 	}
 
@@ -430,7 +432,7 @@ void
 SessionMetadataDialog<DataSet>::init_data ( bool skip_user )
 {
 	if (!_session) {
-		std::cerr << "Programming error: no session set for SessionMetaDataDialog (in init_data)!" << std::endl;
+		error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataDialog (in init_data)!") << endmsg;
 		return;
 	}
 
@@ -711,7 +713,7 @@ void
 SessionMetadataImporter::run ()
 {
 	if (!_session) {
-		std::cerr << "Programming error: no session set for SessionMetaDataImporter (in run)!" << std::endl;
+		error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataImporter (in run)!") << endmsg;
 		return;
 	}
 
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 5059555fff..b0a353e5e8 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -72,42 +72,53 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
 	add_option (_("Timecode"), spf);
 
-	ComboOption<float>* vpu = new ComboOption<float> (
+	_vpu = new ComboOption<float> (
 		"video-pullup",
 		_("Pull-up / pull-down"),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::get_video_pullup),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::set_video_pullup)
 		);
 
-	vpu->add (4.1667 + 0.1, _("4.1667 + 0.1%"));
-	vpu->add (4.1667, _("4.1667"));
-	vpu->add (4.1667 - 0.1, _("4.1667 - 0.1%"));
-	vpu->add (0.1, _("0.1"));
-	vpu->add (0, _("none"));
-	vpu->add (-0.1, _("-0.1"));
-	vpu->add (-4.1667 + 0.1, _("-4.1667 + 0.1%"));
-	vpu->add (-4.1667, _("-4.1667"));
-	vpu->add (-4.1667 - 0.1, _("-4.1667 - 0.1%"));
+	_vpu->add (4.1667 + 0.1, _("4.1667 + 0.1%"));
+	_vpu->add (4.1667, _("4.1667"));
+	_vpu->add (4.1667 - 0.1, _("4.1667 - 0.1%"));
+	_vpu->add (0.1, _("0.1"));
+	_vpu->add (0, _("none"));
+	_vpu->add (-0.1, _("-0.1"));
+	_vpu->add (-4.1667 + 0.1, _("-4.1667 + 0.1%"));
+	_vpu->add (-4.1667, _("-4.1667"));
+	_vpu->add (-4.1667 - 0.1, _("-4.1667 - 0.1%"));
 
-	add_option (_("Timecode"), vpu);
+	add_option (_("Timecode"), _vpu);
 
-	ClockOption* co = new ClockOption (
-		"timecode-offset",
-		_("Timecode offset"),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_offset),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset)
+
+	add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets")));
+
+	ClockOption* sco = new ClockOption (
+		"slave-timecode-offset",
+		_("Slave Timecode offset"),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::get_slave_timecode_offset),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::set_slave_timecode_offset)
 		);
 
-	co->set_session (_session);
+	sco->set_session (_session);
+	sco->clock().set_negative_allowed (true);
+	Gtkmm2ext::UI::instance()->set_tip (sco->tip_widget(), _("The specified offset is added to the received timecode (MTC or LTC)."));
 
-	add_option (_("Timecode"), co);
+	add_option (_("Timecode"), sco);
 
-	add_option (_("Timecode"), new BoolOption (
-			    "timecode-offset-negative",
-			    _("Timecode Offset Negative"),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_offset_negative),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset_negative)
-			    ));
+	ClockOption* gco = new ClockOption (
+		"timecode-generator-offset",
+		_("Timecode Generator offset"),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_generator_offset),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_generator_offset)
+		);
+
+	gco->set_session (_session);
+	gco->clock().set_negative_allowed (true);
+	Gtkmm2ext::UI::instance()->set_tip (gco->tip_widget(), _("Specify an offset which is added to the generated timecode (so far only LTC)."));
+
+	add_option (_("Timecode"), gco);
 
 	add_option (_("Timecode"), new OptionEditorHeading (_("JACK Transport/Time Settings")));
 
@@ -292,6 +303,18 @@ void
 SessionOptionEditor::parameter_changed (std::string const & p)
 {
 	OptionEditor::parameter_changed (p);
+	if (p == "external-sync") {
+		if (Config->get_sync_source() == JACK) {
+			_vpu->set_sensitive(!_session_config->get_external_sync());
+		} else {
+			_vpu->set_sensitive(true);
+		}
+	}
+	if (p == "timecode-format") {
+		/* update offset clocks */
+		parameter_changed("timecode-generator-offset");
+		parameter_changed("slave-timecode-offset");
+	}
 }
 
 /* the presence of absence of a monitor section is not really a regular session
diff --git a/gtk2_ardour/session_option_editor.h b/gtk2_ardour/session_option_editor.h
index 3914ec8a8d..73b9b2b033 100644
--- a/gtk2_ardour/session_option_editor.h
+++ b/gtk2_ardour/session_option_editor.h
@@ -36,4 +36,6 @@ private:
 
 	bool set_use_monitor_section (bool);
 	bool get_use_monitor_section ();
+
+	ComboOption<float>* _vpu;
 };
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index b0a4d90339..a1cb4a969e 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -54,10 +54,11 @@
 
 #include "ardour/audio_library.h"
 
+using namespace PBD;
+
 static const std::string base_url = "http://www.freesound.org/api";
 static const std::string api_key = "9d77cb8d841b4bcfa960e1aae62224eb"; // ardour3
 
-
 //------------------------------------------------------------------------
 Mootcher::Mootcher()
 	: curl(curl_easy_init())
@@ -180,12 +181,11 @@ std::string Mootcher::doRequest(std::string uri, std::string params)
 	}
 		
 	curl_easy_setopt(curl, CURLOPT_URL, url.c_str() );
-	std::cerr << "doRequest: " << url << std::endl;
 	
 	// perform online request
 	CURLcode res = curl_easy_perform(curl);
 	if( res != 0 ) {
-		std::cerr << "curl error " << res << " (" << curl_easy_strerror(res) << ")" << std::endl;
+		error << string_compose (_("curl error %1 (%2)"), res, curl_easy_strerror(res)) << endmsg;
 		return "";
 	}
 
@@ -235,8 +235,6 @@ std::string Mootcher::getSoundResourceFile(std::string ID)
 	std::string xml;
 
 
-	std::cerr << "getSoundResourceFile(" << ID << ")" << std::endl;
-
 	// download the xmlfile into xml_page
 	xml = doRequest("/sounds/" + ID, "");
 
@@ -246,12 +244,12 @@ std::string Mootcher::getSoundResourceFile(std::string ID)
 
 	// if the page is not a valid xml document with a 'freesound' root
 	if (freesound == NULL) {
-		std::cerr << "getSoundResourceFile: There is no valid root in the xml file" << std::endl;
+		error << _("getSoundResourceFile: There is no valid root in the xml file") << endmsg;
 		return "";
 	}
 
 	if (strcmp(doc.root()->name().c_str(), "response") != 0) {
-		std::cerr << "getSoundResourceFile: root =" << doc.root()->name() << ", != response" << std::endl;
+		error << string_compose (_("getSoundResourceFile: root = %1, != response"), doc.root()->name()) << endmsg;
 		return "";
 	}
 
@@ -302,7 +300,6 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
 	if (testFile) {  
 		fseek (testFile , 0 , SEEK_END);
 		if (ftell (testFile) > 256) {
-			std::cerr << "audio file " << audioFileName << " already exists" << std::endl;
 			fclose (testFile);
 			return audioFileName;
 		}
@@ -337,7 +334,6 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, audioFileWrite);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, theFile);
 
-	std::cerr << "downloading " << audioFileName << " from " << audioURL << "..." << std::endl;
 	/* hack to get rid of the barber-pole stripes */
 	caller->freesound_progress_bar.hide();
 	caller->freesound_progress_bar.show();
@@ -358,11 +354,10 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
 	caller->freesound_progress_bar.set_text("");
 	
 	if( res != 0 ) {
-		std::cerr <<  "curl error " << res << " (" << curl_easy_strerror(res) << ")" << std::endl;
+		error <<  string_compose (_("curl error %1 (%2)"), res, curl_easy_strerror(res)) << endmsg;
 		remove( audioFileName.c_str() );  
 		return "";
 	} else {
-		std::cerr << "done!" << std::endl;
 		// now download the tags &c.
 		getSoundResourceFile(ID);
 	}
@@ -387,7 +382,6 @@ SoundFileBrowser *sfb = (SoundFileBrowser *) caller;
 	while (Glib::MainContext::get_default()->iteration (false)) {
 		/* do nothing */
 	}
-	std::cerr << "progress: " << dlnow << " of " << dltotal << " \r";
 	return 0;
 }
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index eab34a6a0a..42d304e8f4 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -862,19 +862,19 @@ SoundFileBrowser::freesound_search()
 		XMLNode *root = doc.root();
 
 		if (!root) {
-			cerr << "no root XML node!" << endl;
+			error << "no root XML node!" << endmsg;
 			break;
 		}
 
 		if ( strcmp(root->name().c_str(), "response") != 0) {
-			cerr << "root node name == " << root->name() << ", != \"response\"!" << endl;
+			error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg;
 			break;
 		}
 
 		XMLNode *sounds_root = root->child("sounds");
 		
 		if (!sounds_root) {
-			cerr << "no child node \"sounds\" found!" << endl;
+			error << "no child node \"sounds\" found!" << endmsg;
 			break;
 		}
 		
@@ -884,7 +884,7 @@ SoundFileBrowser::freesound_search()
 		for (niter = sounds.begin(); niter != sounds.end(); ++niter) {
 			node = *niter;
 			if( strcmp( node->name().c_str(), "resource") != 0 ){
-				cerr << "node->name()=" << node->name() << ",!= \"resource\"!" << endl;
+				error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg;
 				freesound_search_cancel = true;
 				break;
 			}
diff --git a/gtk2_ardour/soundgrid.mm b/gtk2_ardour/soundgrid.mm
index 31d72364e3..499bcd0c89 100644
--- a/gtk2_ardour/soundgrid.mm
+++ b/gtk2_ardour/soundgrid.mm
@@ -84,7 +84,7 @@ soundgrid_shutdown ()
 static bool
 soundgrid_driver_init (uint32_t max_phys_inputs, uint32_t max_phys_outputs, uint32_t max_tracks)
 {
-        wait_dialog->set_secondary_text (_("Nearly ready..."), true);
+        wait_dialog->set_secondary_text (_("Configuring CoreAudio driver ..."), true);
         pbar->hide ();
 
         Gtkmm2ext::UI::instance()->flush_pending ();
@@ -161,8 +161,8 @@ soundgrid_init (uint32_t max_phys_inputs, uint32_t max_phys_outputs,
                                                  max_plugins));
 
         
-        wait_dialog = new Gtk::MessageDialog (_("<b>Please wait while SoundGrid is initialized (approx 6 seconds)</b>"),
-                                              true, /* use markup */
+        wait_dialog = new Gtk::MessageDialog (_("Please wait a few seconds while your SoundGrid is configured"),
+                                              false, /* use markup */
                                               Gtk::MESSAGE_WARNING,
                                               Gtk::BUTTONS_NONE, 
                                               true); /* modal */
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index b2777eb48c..9f558be233 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -79,6 +79,7 @@ Splash::Splash ()
 
 	set_default_size (pixbuf->get_width(), pixbuf->get_height());
 	set_resizable (false);
+	set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 	the_splash = this;
 
         expose_done = false;
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index fd1d216028..c7b6b9528a 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -130,6 +130,8 @@ ArdourStartup::ArdourStartup (bool require_new,
 		if (!window_icons.empty ()) {
 			set_default_icon_list (window_icons);
 		}
+
+		set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
 		
 		// setup_prerelease_page ();
 		
diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index 2cb7e652b5..21c4fb63dc 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -48,6 +48,8 @@ TimeInfoBox::TimeInfoBox ()
 	, syncing_selection (false)
 	, syncing_punch (false)
 {
+	set_name (X_("TimeInfoBox"));
+
 	selection_start = new AudioClock ("selection-start", false, "selection", false, false, false, false);
 	selection_end = new AudioClock ("selection-end", false, "selection", false, false, false, false);
 	selection_length = new AudioClock ("selection-length", false, "selection", false, false, true, false);
@@ -84,7 +86,7 @@ TimeInfoBox::TimeInfoBox ()
 	Gtk::Label* l;
 
 	selection_title.set_name ("TimeInfoSelectionTitle");
-	left.attach (selection_title, 0, 2, 0, 1);
+	left.attach (selection_title, 1, 2, 0, 1);
 	l = manage (new Label);
 	l->set_text (_("Start"));
 	l->set_alignment (1.0, 0.5);
@@ -120,7 +122,7 @@ TimeInfoBox::TimeInfoBox ()
 	Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end"));
 
 	punch_title.set_name ("TimeInfoSelectionTitle");
-	right.attach (punch_title, 2, 4, 0, 1);
+	right.attach (punch_title, 3, 4, 0, 1);
         right.attach (punch_in_button, 2, 3, 1, 2, FILL, SHRINK);
         right.attach (*punch_start, 3, 4, 1, 2);
         right.attach (punch_out_button, 2, 3, 2, 3, FILL, SHRINK);
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index d383758002..952a393f27 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -25,6 +25,8 @@
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
 #include <cstdlib>
+#include <clocale>
+#include <cstring>
 #include <cctype>
 #include <fstream>
 #include <list>
@@ -226,7 +228,7 @@ get_font_for_style (string widgetname)
 
 	Glib::RefPtr<const Pango::Layout> layout = foobar.get_layout();
 
-	PangoFontDescription *pfd = (PangoFontDescription *)pango_layout_get_font_description(const_cast<PangoLayout *>(layout->gobj()));
+	PangoFontDescription *pfd = const_cast<PangoFontDescription *> (pango_layout_get_font_description(const_cast<PangoLayout *>(layout->gobj())));
 
 	if (!pfd) {
 
@@ -549,7 +551,7 @@ get_icon (const char* cname)
 	} catch (const Gdk::PixbufError &e) {
 		cerr << "Caught PixbufError: " << e.what() << endl;
 	} catch (...) {
-		g_message("Caught ... ");
+		error << string_compose (_("Caught exception while loading icon named %1"), cname) << endmsg;
 	}
 
 	return img;
@@ -586,11 +588,44 @@ longest (vector<string>& strings)
 bool
 key_is_legal_for_numeric_entry (guint keyval)
 {
+	/* we assume that this does not change over the life of the process 
+	 */
+
+	static int comma_decimal = -1;
+
 	switch (keyval) {
-	case GDK_minus:
-	case GDK_plus:
 	case GDK_period:
 	case GDK_comma:
+		if (comma_decimal < 0) {
+			std::lconv* lc = std::localeconv();
+			if (strchr (lc->decimal_point, ',') != 0) {
+				comma_decimal = 1;
+			} else {
+				comma_decimal = 0;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	switch (keyval) {
+	case GDK_period:
+		if (comma_decimal) {
+			return false;
+		} else {
+			return true;
+		}
+		break;
+	case GDK_comma:
+		if (comma_decimal) {
+			return true;
+		} else {
+			return false;
+		}
+		break;
+	case GDK_minus:
+	case GDK_plus:
 	case GDK_0:
 	case GDK_1:
 	case GDK_2:
diff --git a/icons/metronome.svg b/icons/metronome.svg
new file mode 100644
index 0000000000..8c637ed31f
--- /dev/null
+++ b/icons/metronome.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="metronome.svg"
+   inkscape:export-filename="/usr/local/music/src/ardour/3.0/icons/metronome.png"
+   inkscape:export-xdpi="90.629997"
+   inkscape:export-ydpi="90.629997">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       id="perspective16" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#54555d"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="3.8473868"
+     inkscape:cy="10.831237"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1361"
+     inkscape:window-height="851"
+     inkscape:window-x="1660"
+     inkscape:window-y="15"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3082"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3863"
+       d="m 10.168027,1029.8622 -5.6055269,21 14.8749999,0 -5.605526,-21 -0.751578,0 -2.129475,0 -0.782894,0 z"
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:export-xdpi="115.66"
+       inkscape:export-ydpi="115.66" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3865"
+       d="m 6.541341,1043.5578 10.917318,0"
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3101"
+       d="M 10.668623,1043.5578 5.3644182,1030.6693"
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="cc"
+       inkscape:transform-center-y="-8.3149"
+       inkscape:transform-center-x="3.4441509" />
+    <g
+       id="g3856"
+       style="stroke:#ffffff;stroke-width:2.19440592;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.66417910000000002"
+       transform="matrix(0.90977646,0,0,0.91304328,1.0826824,90.466479)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3054"
+         d="M 5.9999998,1043.8622 18,1043.8622"
+         style="fill:none;stroke:#ffffff;stroke-width:2.19440592;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+      <g
+         id="g3962"
+         style="stroke:#ffffff;stroke-width:2.19440592;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none">
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2.19440592;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           d="m 9.9863479,1028.8622 -6.1614328,23 16.3501699,0 -6.161432,-23 -0.826113,0 -2.340657,0 -0.8605351,0 z"
+           id="path3047"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:transform-center-x="3.4441509"
+           inkscape:transform-center-y="-8.3149"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#ffffff;stroke-width:2.19440592;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 10.609225,1044.038 5.1116982,1030.7324"
+           id="path3960"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 3bfd8f2a4e..c398409080 100644
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -38,12 +38,16 @@
 
 using namespace ARDOUR;
 using namespace PBD;
+using std::min;
+
+/* gain range of -inf to +6dB, default 0dB */
+const float Amp::max_gain_coefficient = 1.99526231f;
 
 Amp::Amp (Session& s
 #if HAVE_SOUNDGRID
           , SoundGridRack* sr
 #endif
-        )
+	)
 	: Processor(s, "Amp")
 	, _apply_gain(true)
 	, _apply_gain_automation(false)
@@ -54,8 +58,7 @@ Amp::Amp (Session& s
 #endif
 {
 	Evoral::Parameter p (GainAutomation);
-	/* gain range of -inf to +6dB, default 0dB */
-	p.set_range (0, 1.99526231f, 1, false);
+	p.set_range (0, max_gain_coefficient, 1, false);
 	boost::shared_ptr<AutomationList> gl (new AutomationList (p));
 	_gain_control = boost::shared_ptr<GainControl> (new GainControl (X_("gaincontrol"), s, this, p, gl));
 	_gain_control->set_flags (Controllable::GainLike);
@@ -131,7 +134,7 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/,
 				for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
 
 					MidiBuffer& mb (*i);
-
+					
 					for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
 						Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
 						if (ev.is_note_on()) {
@@ -189,7 +192,7 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t nframes, gain_t initial, gain_t tar
 			Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
 
 			if (ev.is_note_on()) {
-				gain_t scale = delta * (ev.time()/(double) nframes);
+				const gain_t scale = delta * (ev.time()/(double) nframes);
 				ev.scale_velocity (initial+scale);
 			}
 		}
@@ -388,10 +391,7 @@ Amp::inc_gain (gain_t factor, void *src)
 void
 Amp::set_gain (gain_t val, void *src)
 {
-	// max gain at about +6dB (10.0 ^ ( 6 dB * 0.05))
-	if (val > 1.99526231f) {
-		val = 1.99526231f;
-	}
+	val = min (val, max_gain_coefficient);
 
 	if (src != _gain_control.get()) {
 		_gain_control->set_value (val);
@@ -433,9 +433,8 @@ Amp::set_state (const XMLNode& node, int version)
 void
 Amp::GainControl::set_value (double val)
 {
-	// max gain at about +6dB (10.0 ^ ( 6 dB * 0.05))
-	if (val > 1.99526231) {
-		val = 1.99526231;
+	if (val > max_gain_coefficient) {
+		val = max_gain_coefficient;
 	}
 
 #if HAVE_SOUNDGRID
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 56b6580777..0540541bb2 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -113,11 +113,11 @@ public:
 	}
 
 	std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
-
 #if HAVE_SOUNDGRID
         SoundGridRack* soundgrid_rack() const { return _rack; }
 #endif
-	
+        static const float max_gain_coefficient;
+
 private:
 	bool   _denormal_protection;
 	bool   _apply_gain;
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 6e0f7a97b5..762973738b 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -76,19 +76,6 @@ public:
 	const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; }
 	void what_has_existing_automation (std::set<Evoral::Parameter>&) const;
 
-	inline bool should_snapshot (framepos_t now) {
-		return (_last_automation_snapshot > now
-				|| (now - _last_automation_snapshot) > _automation_interval);
-	}
-
-	static void set_automation_interval (framecnt_t frames) {
-		_automation_interval = frames;
-	}
-
-	static framecnt_t automation_interval() {
-		return _automation_interval;
-	}
-
 	static const std::string xml_node_name;
 
 	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
@@ -107,7 +94,6 @@ public:
 	std::set<Evoral::Parameter> _can_automate_list;
 
 	framepos_t _last_automation_snapshot;
-	static framecnt_t _automation_interval;
 
 private:
 	PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h
index 6fd5a0eb65..f3e343468d 100644
--- a/libs/ardour/ardour/automation_watch.h
+++ b/libs/ardour/ardour/automation_watch.h
@@ -17,7 +17,7 @@
 
 */
 
-#include <list>
+#include <set>
 #include <boost/shared_ptr.hpp>
 #include <glibmm/threads.h>
 #include <sigc++/signal.h>
@@ -41,7 +41,7 @@ class AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr,
     gint timer ();
 
   private:
-    typedef std::list<boost::shared_ptr<ARDOUR::AutomationControl> > AutomationWatches;
+    typedef std::set<boost::shared_ptr<ARDOUR::AutomationControl> > AutomationWatches;
 
     AutomationWatch ();
     ~AutomationWatch();
@@ -50,7 +50,7 @@ class AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr,
     Glib::Threads::Thread*  _thread;
     bool                    _run_thread;
     AutomationWatches        automation_watches;
-    Glib::Threads::Mutex              automation_watch_lock;
+    Glib::Threads::Mutex     automation_watch_lock;
     PBD::ScopedConnection    transport_connection;
 
     void transport_state_change ();
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index 1090f30307..66c44884ea 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -111,8 +111,6 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	boost::shared_ptr<Plugin::ScalePoints>
 	get_scale_points(uint32_t port_index) const;
 
-	static uint32_t midi_event_type() { return _midi_event_type; }
-
 	void set_insert_info(const PluginInsert* insert);
 
 	int      set_state (const XMLNode& node, int version);
@@ -124,9 +122,7 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	bool has_editor () const;
 	bool has_message_output () const;
 
-	uint32_t atom_eventTransfer() const;
-
-	void write_from_ui(uint32_t       index,
+	bool write_from_ui(uint32_t       index,
 	                   uint32_t       protocol,
 	                   uint32_t       size,
 	                   const uint8_t* body);
@@ -147,14 +143,26 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 
 	static URIMap _uri_map;
 
-	static uint32_t _midi_event_type;
-	static uint32_t _chunk_type;
-	static uint32_t _sequence_type;
-	static uint32_t _event_transfer_type;
-	static uint32_t _path_type;
-	static uint32_t _log_Error;
-	static uint32_t _log_Warning;
-	static uint32_t _log_Note;
+	struct URIDs {
+		uint32_t atom_Chunk;
+		uint32_t atom_Path;
+		uint32_t atom_Sequence;
+		uint32_t atom_eventTransfer;
+		uint32_t log_Error;
+		uint32_t log_Note;
+		uint32_t log_Warning;
+		uint32_t midi_MidiEvent;
+		uint32_t time_Position;
+		uint32_t time_bar;
+		uint32_t time_barBeat;
+		uint32_t time_beatUnit;
+		uint32_t time_beatsPerBar;
+		uint32_t time_beatsPerMinute;
+		uint32_t time_frame;
+		uint32_t time_speed;
+	};
+
+	static URIDs urids;
 
   private:
 	struct Impl;
@@ -171,6 +179,8 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	float*        _bpm_control_port;  ///< Special input set by ardour
 	float*        _freewheel_control_port;  ///< Special input set by ardour
 	float*        _latency_control_port;  ///< Special output set by ardour
+	framepos_t    _next_cycle_start;  ///< Expected start frame of next run cycle
+	double        _next_cycle_speed;  ///< Expected start frame of next run cycle
 	PBD::ID       _insert_id;
 
 	friend const void* lv2plugin_get_port_value(const char* port_symbol,
@@ -179,13 +189,14 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	                                            uint32_t*   type);
 
 	typedef enum {
-		PORT_INPUT   = 1,
-		PORT_OUTPUT  = 1 << 1,
-		PORT_AUDIO   = 1 << 2,
-		PORT_CONTROL = 1 << 3,
-		PORT_EVENT   = 1 << 4,
-		PORT_MESSAGE = 1 << 5,
-		PORT_ATOM    = 1 << 6
+		PORT_INPUT    = 1,       ///< Input port
+		PORT_OUTPUT   = 1 << 1,  ///< Output port
+		PORT_AUDIO    = 1 << 2,  ///< Audio (buffer of float)
+		PORT_CONTROL  = 1 << 3,  ///< Control (single float)
+		PORT_EVENT    = 1 << 4,  ///< Old event API event port
+		PORT_SEQUENCE = 1 << 5,  ///< New atom API event port
+		PORT_MIDI     = 1 << 6,  ///< Event port understands MIDI
+		PORT_POSITION = 1 << 7   ///< Event port understands position
 	} PortFlag;
 
 	typedef unsigned PortFlags;
@@ -200,12 +211,12 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 		uint32_t size;
 	};
 
-	void write_to_ui(uint32_t       index,
+	bool write_to_ui(uint32_t       index,
 	                 uint32_t       protocol,
 	                 uint32_t       size,
 	                 const uint8_t* body);
 
-	void write_to(RingBuffer<uint8_t>* dest,
+	bool write_to(RingBuffer<uint8_t>* dest,
 	              uint32_t             index,
 	              uint32_t             protocol,
 	              uint32_t             size,
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index b88f603f5d..64ecb7db40 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -166,7 +166,7 @@ CONFIG_VARIABLE (int32_t, history_depth, "history-depth", 20)
 CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false)
 CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true)
 CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120)
-CONFIG_VARIABLE (float, automation_interval, "automation-interval", 500)
+CONFIG_VARIABLE (float, automation_interval_msecs, "automation-interval-msecs", 30)
 CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
 CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false)
 CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", false)
@@ -202,6 +202,7 @@ CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalFTZDAZ
 
 CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true)
 CONFIG_VARIABLE (bool, widget_prelight, "widget-prelight", true)
+CONFIG_VARIABLE (bool, use_tooltips, "use-tooltips", true)
 CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-strip-visibility", "PhaseInvert,SoloSafe,SoloIsolated,Group,MeterPoint")
 CONFIG_VARIABLE (bool, allow_non_quarter_pulse, "allow-non-quarter-pulse", false)
 CONFIG_VARIABLE (bool, show_region_gain, "show-region-gain", false)
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 26498e5f4f..94fba35fd3 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -607,9 +607,9 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 
         void reset_instrument_info ();
 
-        /* */
+        void set_remote_control_id_internal (uint32_t id, bool notify_class_listeners = true);
+
         SoundGridRack* _sg_rack;
-           
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 89744669e7..5e75b4980b 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -251,7 +251,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<Route> route_by_id (PBD::ID);
 	boost::shared_ptr<Route> route_by_remote_id (uint32_t id);
 	boost::shared_ptr<Track> track_by_diskstream_id (PBD::ID);
-	void routes_using_input_from (const std::string& str, RouteList& rl);
+        void routes_using_input_from (const std::string& str, RouteList& rl);
 
 	bool route_name_unique (std::string) const;
 	bool route_name_internal (std::string) const;
@@ -361,7 +361,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 		return mtc_timecode_bits;   /* encoding of SMTPE type for MTC */
 	}
 
-	float timecode_frames_per_second() const;
+	double timecode_frames_per_second() const;
 	bool timecode_drop_frames() const;
 
 	/* Locations */
@@ -616,8 +616,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void set_listen (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
 	void set_record_enabled (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
 	void set_solo_isolated (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
-	void set_exclusive_input_active (boost::shared_ptr<Route> rt, bool others_on);
 	void set_monitoring (boost::shared_ptr<RouteList>, MonitorChoice, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+        void set_exclusive_input_active (boost::shared_ptr<RouteList> rt, bool onoff, bool flip_others=false);
 
 	PBD::Signal1<void,bool> SoloActive;
 	PBD::Signal0<void> SoloChanged;
@@ -1203,6 +1203,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	framepos_t        ltc_enc_off;
 	bool              restarting;
 
+	framepos_t        ltc_timecode_offset;
+	bool              ltc_timecode_negative_offset;
+
 	jack_latency_range_t ltc_out_latency;
 
 	void ltc_tx_initialize();
@@ -1210,6 +1213,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void ltc_tx_reset();
 	void ltc_tx_resync_latency();
 	void ltc_tx_recalculate_position();
+	void ltc_tx_parse_offset();
 	void ltc_tx_send_time_code_for_cycle (framepos_t, framepos_t, double, double, pframes_t nframes);
 #endif
 
@@ -1265,6 +1269,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	SerializedRCUManager<RouteList>  routes;
 
 	void add_routes (RouteList&, bool input_auto_connect, bool output_auto_connect, bool save);
+        void add_routes_inner (RouteList&, bool input_auto_connect, bool output_auto_connect);
+        bool _adding_routes_in_progress;
 	uint32_t destructive_index;
 
 	boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int);
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 911c9366fe..1a4a17ce5d 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -53,6 +53,8 @@ CONFIG_VARIABLE (bool, external_sync, "external-sync", false)
 CONFIG_VARIABLE (InsertMergePolicy, insert_merge_policy, "insert-merge-policy", InsertMergeRelax)
 CONFIG_VARIABLE (framecnt_t, timecode_offset, "timecode-offset", 0)
 CONFIG_VARIABLE (bool, timecode_offset_negative, "timecode-offset-negative", true)
+CONFIG_VARIABLE (std::string, slave_timecode_offset, "slave-timecode-offset", " 00:00:00:00")
+CONFIG_VARIABLE (std::string, timecode_generator_offset, "timecode-generator-offset", " 00:00:00:00")
 CONFIG_VARIABLE (bool, glue_new_markers_to_bars_and_beats, "glue-new-markers-to-bars-and-beats", false)
 CONFIG_VARIABLE (bool, midi_copy_is_fork, "midi-copy-is-fork", false)
 CONFIG_VARIABLE (bool, glue_new_regions_to_bars_and_beats, "glue-new-regions-to-bars-and-beats", false)
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index de58e07e36..d5cb79c522 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -38,8 +38,9 @@
 #include <ltc.h>
 #endif
 
-// used for approximate_current_delta():
-#define PLUSMINUS(A) ( ((A)<0) ? "\u2012" : (((A)>0) ? "+" : "\u00B1") )
+/* used for approximate_current_delta(): */
+#define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") )
+#define LEADINGZERO(A) ( (A)<10 ? "    " : (A)<100 ? "   " : (A)<1000 ? "  " : (A)<10000 ? " " : "" )
 
 namespace MIDI {
 	class Port;
@@ -246,6 +247,9 @@ class TimecodeSlave : public Slave {
        of the TC source position.
     */
     virtual std::string approximate_current_position() const = 0;
+
+    framepos_t        timecode_offset;
+    bool              timecode_negative_offset;
 };
 
 class MTC_Slave : public TimecodeSlave {
@@ -273,6 +277,7 @@ class MTC_Slave : public TimecodeSlave {
 	Session&    session;
 	MIDI::Port* port;
 	PBD::ScopedConnectionList port_connections;
+	PBD::ScopedConnection     config_connection;
 	bool        can_notify_on_unknown_rate;
 
 	static const int frame_tolerance;
@@ -326,6 +331,8 @@ class MTC_Slave : public TimecodeSlave {
 	bool outside_window (framepos_t) const;
 	void init_mtc_dll(framepos_t, double);
 	void init_engine_dll (framepos_t, framepos_t);
+	void parse_timecode_offset();
+	void parameter_changed(std::string const & p);
 };
 
 #ifdef HAVE_LTC
@@ -358,6 +365,8 @@ public:
 	void reset();
 	void resync_xrun();
 	void resync_latency();
+	void parse_timecode_offset();
+	void parameter_changed(std::string const & p);
 
 	Session&       session;
 	bool           did_reset_tc_format;
@@ -383,6 +392,7 @@ public:
 	Timecode::TimecodeFormat a3e_timecode;
 
 	PBD::ScopedConnectionList port_connections;
+	PBD::ScopedConnection     config_connection;
 	jack_latency_range_t      ltc_slave_latency;
 
 	/* DLL - chase LTC */
diff --git a/libs/ardour/ardour/soundgrid.h b/libs/ardour/ardour/soundgrid.h
index d10f54617c..8d9534b3d0 100644
--- a/libs/ardour/ardour/soundgrid.h
+++ b/libs/ardour/ardour/soundgrid.h
@@ -208,7 +208,13 @@ class SoundGrid : public boost::noncopyable
                     : Port (eClusterType_GroupTrack, channel,
                             eControlType_Input, 0, eControlID_Input_Assignment_Left, 0, Port::Pre) {}
         };
-        
+
+        struct PseudoPhysicalOutputPortXX : public Port {
+            PseudoPhysicalOutputPortXX (uint32_t channel) 
+                    : Port (eClusterType_GroupTrack, channel,
+                            eControlType_Input, 0, eControlID_Input_Assignment_Left, wvEnum_Unknown, Port::Pre) {}
+        };
+
         struct TrackInputPort : public Port {
                 TrackInputPort (uint32_t chainer_id, uint32_t channel) 
                         : Port (eClusterType_InputTrack, chainer_id, 
@@ -240,6 +246,8 @@ class SoundGrid : public boost::noncopyable
         std::string sg_port_as_jack_port (const Port& port);
         bool        jack_port_as_sg_port (const std::string& jack_port, Port& result);
 
+        void        drop_sg_jack_mapping (const std::string& jack_port);
+
         void parameter_updated (WEParamType paramID);
 
   private:
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 8e4f1bc420..bedc825288 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -34,17 +34,17 @@
 
 #include "ardour/ardour.h"
 
-class XMLNode;
-
 class BBTTest;
 class FrameposPlusBeatsTest;
 class TempoTest;
+class XMLNode;
 
 namespace ARDOUR {
 
 class Meter;
 class TempoMap;
 
+/** Tempo, the speed at which musical time progresses (BPM). */
 class Tempo {
   public:
 	Tempo (double bpm, double type=4.0) // defaulting to quarter note
@@ -52,13 +52,16 @@ class Tempo {
 
 	double beats_per_minute () const { return _beats_per_minute;}
 	double note_type () const { return _note_type;}
-	double frames_per_beat (framecnt_t sr) const;
+	double frames_per_beat (framecnt_t sr) const {
+		return (60.0 * sr) / _beats_per_minute;
+	}
 
   protected:
 	double _beats_per_minute;
 	double _note_type;
 };
 
+/** Meter, or time signature (beats per bar, and which note type is a beat). */
 class Meter {
   public:
 	Meter (double dpb, double bt)
@@ -83,6 +86,7 @@ class Meter {
 	double _note_type;
 };
 
+/** A section of timeline with a certain Tempo or Meter. */
 class MetricSection {
   public:
 	MetricSection (const Timecode::BBT_Time& start)
@@ -118,6 +122,7 @@ class MetricSection {
 	bool               _movable;
 };
 
+/** A section of timeline with a certain Meter. */
 class MeterSection : public MetricSection, public Meter {
   public:
 	MeterSection (const Timecode::BBT_Time& start, double bpb, double note_type)
@@ -131,6 +136,7 @@ class MeterSection : public MetricSection, public Meter {
 	XMLNode& get_state() const;
 };
 
+/** A section of timeline with a certain Tempo. */
 class TempoSection : public MetricSection, public Tempo {
   public:
 	TempoSection (const Timecode::BBT_Time& start, double qpm, double note_type)
@@ -161,21 +167,35 @@ class TempoSection : public MetricSection, public Tempo {
 
 typedef std::list<MetricSection*> Metrics;
 
-/** Helper class that we use to be able to keep track of which
-    meter *AND* tempo are in effect at a given point in time.
+/** Helper class to keep track of the Meter *AND* Tempo in effect
+    at a given point in time.
 */
 class TempoMetric {
   public:
-	TempoMetric (const Meter& m, const Tempo& t) : _meter (&m), _tempo (&t), _frame (0) {}
+	TempoMetric (const Meter& m, const Tempo& t)
+		: _meter (&m), _tempo (&t), _frame (0) {}
 
-	void set_tempo (const Tempo& t)    { _tempo = &t; }
-	void set_meter (const Meter& m)    { _meter = &m; }
-	void set_frame (framepos_t f)      { _frame = f; }
+	void set_tempo (const Tempo& t)              { _tempo = &t; }
+	void set_meter (const Meter& m)              { _meter = &m; }
+	void set_frame (framepos_t f)                { _frame = f; }
 	void set_start (const Timecode::BBT_Time& t) { _start = t; }
 
-	const Meter&    meter() const { return *_meter; }
-	const Tempo&    tempo() const { return *_tempo; }
-	framepos_t      frame() const { return _frame; }
+	void set_metric (const MetricSection* section) {
+		const MeterSection* meter;
+		const TempoSection* tempo;
+		if ((meter = dynamic_cast<const MeterSection*>(section))) {
+			set_meter(*meter);
+		} else if ((tempo = dynamic_cast<const TempoSection*>(section))) {
+			set_tempo(*tempo);
+		}
+
+		set_frame(section->frame());
+		set_start(section->start());
+	}
+
+	const Meter&              meter() const { return *_meter; }
+	const Tempo&              tempo() const { return *_tempo; }
+	framepos_t                frame() const { return _frame; }
 	const Timecode::BBT_Time& start() const { return _start; }
 
   private:
@@ -199,20 +219,20 @@ class TempoMap : public PBD::StatefulDestructible
 	};
 
 	struct BBTPoint {
-            framepos_t  frame;
-            const MeterSection* meter;
-            const TempoSection* tempo;
-            uint32_t bar;
-            uint32_t beat;
+		framepos_t          frame;
+		const MeterSection* meter;
+		const TempoSection* tempo;
+		uint32_t            bar;
+		uint32_t            beat;
             
-            BBTPoint (const MeterSection& m, const TempoSection& t, framepos_t f,
-                      uint32_t b, uint32_t e)
-                    : frame (f), meter (&m), tempo (&t), bar (b), beat (e) {}
-
-            Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); }
-            operator Timecode::BBT_Time() const { return bbt(); }
-            operator framepos_t() const { return frame; }
-	    bool is_bar() const { return beat == 1; }
+		BBTPoint (const MeterSection& m, const TempoSection& t, framepos_t f,
+		          uint32_t b, uint32_t e)
+			: frame (f), meter (&m), tempo (&t), bar (b), beat (e) {}
+		
+		Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); }
+		operator Timecode::BBT_Time() const { return bbt(); }
+		operator framepos_t() const { return frame; }
+		bool is_bar() const { return beat == 1; }
 	};
 
 	typedef std::vector<BBTPoint> BBTPointList;
@@ -223,7 +243,7 @@ class TempoMap : public PBD::StatefulDestructible
 	}
 
 	void get_grid (BBTPointList::const_iterator&, BBTPointList::const_iterator&, 
-		       framepos_t start, framepos_t end);
+	               framepos_t start, framepos_t end);
 	
 	/* TEMPO- AND METER-SENSITIVE FUNCTIONS 
 
@@ -235,13 +255,14 @@ class TempoMap : public PBD::StatefulDestructible
 	   whose location is canonically defined in beats.
 	*/
 
-	void       bbt_time (framepos_t when, Timecode::BBT_Time&);
+	void bbt_time (framepos_t when, Timecode::BBT_Time&);
+
 	/* realtime safe variant of ::bbt_time(), will throw 
 	   std::logic_error if the map is not large enough
 	   to provide an answer.
 	*/
 	void       bbt_time_rt (framepos_t when, Timecode::BBT_Time&);
-        framepos_t frame_time (const Timecode::BBT_Time&);
+	framepos_t frame_time (const Timecode::BBT_Time&);
 	framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir);
 
 	/* TEMPO-SENSITIVE FUNCTIONS
@@ -267,11 +288,11 @@ class TempoMap : public PBD::StatefulDestructible
 
 	const TempoSection& tempo_section_at (framepos_t) const;
 
-	void add_tempo(const Tempo&, Timecode::BBT_Time where);
-	void add_meter(const Meter&, Timecode::BBT_Time where);
+	void add_tempo (const Tempo&, Timecode::BBT_Time where);
+	void add_meter (const Meter&, Timecode::BBT_Time where);
 
-	void remove_tempo(const TempoSection&, bool send_signal);
-	void remove_meter(const MeterSection&, bool send_signal);
+	void remove_tempo (const TempoSection&, bool send_signal);
+	void remove_meter (const MeterSection&, bool send_signal);
 
 	void replace_tempo (const TempoSection&, const Tempo&, const Timecode::BBT_Time& where);
 	void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where);
@@ -290,8 +311,13 @@ class TempoMap : public PBD::StatefulDestructible
 	void clear ();
 
 	TempoMetric metric_at (Timecode::BBT_Time bbt) const;
-	TempoMetric metric_at (framepos_t) const;
 
+	/** Return the TempoMetric at frame @p t, and point @p last to the latest
+	 * metric change <= t, if it is non-NULL.
+	 */
+	TempoMetric metric_at (framepos_t, Metrics::const_iterator* last=NULL) const;
+
+	Metrics::const_iterator metrics_end() { return metrics.end(); }
 
 	void change_existing_tempo_at (framepos_t, double bpm, double note_type);
 	void change_initial_tempo (double bpm, double note_type);
@@ -312,25 +338,25 @@ class TempoMap : public PBD::StatefulDestructible
 	static Tempo    _default_tempo;
 	static Meter    _default_meter;
 
-	Metrics              metrics;
-	framecnt_t          _frame_rate;
+	Metrics                       metrics;
+	framecnt_t                    _frame_rate;
 	mutable Glib::Threads::RWLock lock;
-	BBTPointList        _map;
+	BBTPointList                  _map;
 
 	void recompute_map (bool reassign_tempo_bbt, framepos_t end = -1);
 	void extend_map (framepos_t end);
-        void require_map_to (framepos_t pos);
-        void require_map_to (const Timecode::BBT_Time&);
+	void require_map_to (framepos_t pos);
+	void require_map_to (const Timecode::BBT_Time&);
 	void _extend_map (TempoSection* tempo, MeterSection* meter, 
-			  Metrics::iterator next_metric,
-			  Timecode::BBT_Time current, framepos_t current_frame, framepos_t end);
+	                  Metrics::iterator next_metric,
+	                  Timecode::BBT_Time current, framepos_t current_frame, framepos_t end);
 
 	BBTPointList::const_iterator bbt_before_or_at (framepos_t);
 	BBTPointList::const_iterator bbt_before_or_at (const Timecode::BBT_Time&);
 	BBTPointList::const_iterator bbt_after_or_at (framepos_t);
 	
 	framepos_t round_to_type (framepos_t fr, int dir, BBTPointType);
-        void bbt_time (framepos_t, Timecode::BBT_Time&, const BBTPointList::const_iterator&);
+	void bbt_time (framepos_t, Timecode::BBT_Time&, const BBTPointList::const_iterator&);
 	framecnt_t bbt_duration_at_unlocked (const Timecode::BBT_Time& when, const Timecode::BBT_Time& bbt, int dir);
 	
 	const MeterSection& first_meter() const;
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 1f39b61a76..d680cc6258 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -229,8 +229,8 @@ AudioEngine::stop (bool forever)
 			disconnect_from_jack ();
 		} else {
 			jack_deactivate (_priv_jack);
-			Stopped(); /* EMIT SIGNAL */
 			MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
+			Stopped(); /* EMIT SIGNAL */
 		}
 	}
 
@@ -1165,8 +1165,8 @@ AudioEngine::halted (void *arg)
         ae->_jack = 0;
 
 	if (was_running) {
-		ae->Halted(""); /* EMIT SIGNAL */
 		MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
+		ae->Halted(""); /* EMIT SIGNAL */
 	}
 }
 
@@ -1448,8 +1448,8 @@ AudioEngine::disconnect_from_jack ()
 
 	if (_running) {
 		_running = false;
-		Stopped(); /* EMIT SIGNAL */
 		MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
+		Stopped(); /* EMIT SIGNAL */
 	}
 
 	return 0;
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 577f12c78e..a02eb3720b 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -82,9 +82,8 @@ static void
 reverse_curve (boost::shared_ptr<Evoral::ControlList> dst, boost::shared_ptr<const Evoral::ControlList> src)
 {
 	size_t len = src->back()->when;
-	
-	for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); it++) {
-		dst->add (len - (*it)->when, (*it)->value);
+	for (Evoral::ControlList::const_reverse_iterator it = src->rbegin(); it!=src->rend(); it++) {
+		dst->fast_simple_add (len - (*it)->when, (*it)->value);
 	}
 }
 
@@ -141,7 +140,7 @@ merge_curves (boost::shared_ptr<Evoral::ControlList> dst,
 		interp += v2 * ( (double)count / (double)size );
 
 		interp = dB_to_coefficient(interp);
-		dst->add ( (*c1)->when, interp );
+		dst->fast_simple_add ( (*c1)->when, interp );
 		c1++;
 		count++;
 	}
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 7c1a2e1e2b..254696a8bf 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -220,7 +220,13 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
 		string phys;
 		vector<string> connections;
 		vector<string> outputs;
+                
+                if (_output->ports().num_ports (DataType::AUDIO) == 0) {
+                        return;
+                }
+
 		_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
+
 		if (_output->nth (0)->get_connections (connections)) {
 			if (outputs.size() > 0) {
 				phys = outputs[0];
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 0f6fbdbe17..1689528123 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -42,7 +42,6 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-framecnt_t Automatable::_automation_interval = 0;
 const string Automatable::xml_node_name = X_("Automation");
 
 Automatable::Automatable(Session& session)
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 83b7db34be..2586a14b58 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -87,8 +87,6 @@ AutomationControl::set_automation_state (AutoState as)
 {
 	if (as != alist()->automation_state()) {
 
-		cerr << name() << " setting automation state to " << enum_2_string (as) << endl;
-
 		alist()->set_automation_state (as);
 
 		if (as == Write) {
@@ -120,14 +118,14 @@ void
 AutomationControl::start_touch(double when)
 {
 	set_touching (true);
-	AutomationWatch::instance().add_automation_watch (shared_from_this());
 	alist()->start_touch(when);
+	AutomationWatch::instance().add_automation_watch (shared_from_this());
 }
 
 void
 AutomationControl::stop_touch(bool mark, double when)
 {
 	set_touching (false);
-	AutomationWatch::instance().remove_automation_watch (shared_from_this());
 	alist()->stop_touch (mark, when);
+	AutomationWatch::instance().remove_automation_watch (shared_from_this());
 }
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 2dc69fe448..e1ff1a0cb1 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -430,7 +430,7 @@ AutomationList::set_state (const XMLNode& node, int version)
 	if ((prop = node.property (X_("automation-id"))) != 0){
 		_parameter = EventTypeMap::instance().new_parameter(prop->value());
 	} else {
-		warning << "Legacy session: automation list has no automation-id property.";
+		warning << "Legacy session: automation list has no automation-id property." << endmsg;
 	}
 
 	if ((prop = node.property (X_("interpolation-style"))) != 0) {
diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index d3138ee336..0fa98f2133 100644
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -28,8 +28,6 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using std::cerr;
-using std::endl;
 
 AutomationWatch* AutomationWatch::_instance = 0;
 
@@ -65,8 +63,8 @@ void
 AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
 {
 	Glib::Threads::Mutex::Lock lm (automation_watch_lock);
-	DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation\n", ac->name()));
-	automation_watches.push_back (ac);
+	DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation, astate = %2\n", ac->name(), enum_2_string (ac->automation_state())));
+	automation_watches.insert (ac);
 
 	/* if an automation control is added here while the transport is
 	 * rolling, make sure that it knows that there is a write pass going
@@ -104,7 +102,7 @@ AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> a
 {
 	Glib::Threads::Mutex::Lock lm (automation_watch_lock);
 	DEBUG_TRACE (DEBUG::Automation, string_compose ("remove control %1 from automation watch\n", ac->name()));
-	automation_watches.remove (ac);
+	automation_watches.erase (ac);
 	ac->list()->set_in_write_pass (false);
 }
 
@@ -117,7 +115,7 @@ AutomationWatch::timer ()
 
 	{
 		Glib::Threads::Mutex::Lock lm (automation_watch_lock);
-		
+
 		framepos_t time = _session->audible_frame ();
 
 		for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
@@ -134,7 +132,7 @@ void
 AutomationWatch::thread ()
 {
 	while (_run_thread) {
-		usleep (100000); // Config->get_automation_interval() * 10);
+		usleep ((useconds_t) floor (Config->get_automation_interval_msecs() * 1000));
 		timer ();
 	}
 }
diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index f9e683cdda..1f8317ffe2 100644
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -192,8 +192,8 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
 			_lv2_buffers.push_back(
 				std::make_pair(false, lv2_evbuf_new(buffer_capacity,
 				                                    LV2_EVBUF_EVENT,
-				                                    LV2Plugin::_chunk_type,
-				                                    LV2Plugin::_sequence_type)));
+				                                    LV2Plugin::urids.atom_Chunk,
+				                                    LV2Plugin::urids.atom_Sequence)));
 		}
 	}
 #endif
@@ -257,34 +257,11 @@ BufferSet::get_lv2_midi(bool input, size_t i, bool old_api)
 {
 	assert(count().get(DataType::MIDI) > i);
 
-	MidiBuffer&            mbuf  = get_midi(i);
 	LV2Buffers::value_type b     = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
 	LV2_Evbuf*             evbuf = b.second;
-	lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM);
 
+	lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM);
 	lv2_evbuf_reset(evbuf, input);
-	if (input) {
-		DEBUG_TRACE(PBD::DEBUG::LV2,
-		            string_compose("%1 bytes of MIDI waiting @ %2\n",
-		                           mbuf.size(), (void*) mbuf.data()));
-		
-		LV2_Evbuf_Iterator i    = lv2_evbuf_begin(evbuf);
-		const uint32_t     type = LV2Plugin::midi_event_type();
-		for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) {
-			const Evoral::MIDIEvent<framepos_t> ev(*e, false);
-#ifndef NDEBUG
-			DEBUG_TRACE(PBD::DEBUG::LV2,
-			            string_compose("\tMIDI event of size %1 @ %2\n",
-			                           ev.size(), ev.time()));
-			for (uint16_t x = 0; x < ev.size(); ++x) {
-				std::stringstream ss;
-				ss << "\t\tev[" << x << "] = " << std::hex << (int) ev.buffer()[x] << std::dec << std::endl;
-				DEBUG_TRACE (PBD::DEBUG::LV2, ss.str());
-			}
-#endif
-			lv2_evbuf_write(&i, ev.time(), 0, type, ev.size(), ev.buffer());
-		}
-	}
 	return evbuf;
 }
 
@@ -311,7 +288,10 @@ BufferSet::flush_lv2_midi(bool input, size_t i)
 			DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tByte[%1] = %2\n", x, (int) data[x]));
 		}
 #endif
-		mbuf.push_back(frames, size, data);
+		if (type == LV2Plugin::urids.midi_MidiEvent) {
+			// TODO: Make Ardour event buffers generic so plugins can communicate
+			mbuf.push_back(frames, size, data);
+		}
 	}
 }
 
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 9afd53f75d..b967990b4f 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -205,10 +205,8 @@ lotsa_files_please ()
 				error << string_compose (_("Could not set system open files limit to %1"), rl.rlim_cur) << endmsg;
 			}
 		} else {
-			if (rl.rlim_cur == RLIM_INFINITY) {
-				info << _("Removed open file count limit. Excellent!") << endmsg;
-			} else {
-				info << string_compose (_("%1 will be limited to %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
+			if (rl.rlim_cur != RLIM_INFINITY) {
+				info << string_compose (_("Your system is configured to limit %1 to only %2 open files"), PROGRAM_NAME, rl.rlim_cur) << endmsg;
 			}
 		}
 	} else {
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index f28770b175..f063e830c1 100644
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -60,6 +60,9 @@ LTC_Slave::LTC_Slave (Session& s)
 	memset(&prev_frame, 0, sizeof(LTCFrameExt));
 
 	decoder = ltc_decoder_create((int) frames_per_ltc_frame, 128 /*queue size*/);
+
+	session.config.ParameterChanged.connect_same_thread (config_connection, boost::bind (&LTC_Slave::parameter_changed, this, _1));
+	parse_timecode_offset();
 	reset();
 	resync_latency();
 	session.Xrun.connect_same_thread (port_connections, boost::bind (&LTC_Slave::resync_xrun, this));
@@ -69,6 +72,7 @@ LTC_Slave::LTC_Slave (Session& s)
 LTC_Slave::~LTC_Slave()
 {
 	port_connections.drop_connections();
+	config_connection.disconnect();
 
 	if (did_reset_tc_format) {
 		session.config.set_timecode_format (saved_tc_format);
@@ -77,6 +81,27 @@ LTC_Slave::~LTC_Slave()
 	ltc_decoder_free(decoder);
 }
 
+void
+LTC_Slave::parse_timecode_offset() {
+	Timecode::Time offset_tc;
+	Timecode::parse_timecode_format(session.config.get_slave_timecode_offset(), offset_tc);
+	offset_tc.rate = session.timecode_frames_per_second();
+	offset_tc.drop = session.timecode_drop_frames();
+	session.timecode_to_sample(offset_tc, timecode_offset, false, false);
+	timecode_negative_offset = offset_tc.negative;
+}
+
+void
+LTC_Slave::parameter_changed (std::string const & p)
+{
+	if (p == "slave-timecode-offset"
+			|| p == "subframes-per-frame"
+			|| p == "timecode-format"
+			) {
+		parse_timecode_offset();
+	}
+}
+
 ARDOUR::framecnt_t
 LTC_Slave::resolution () const
 {
@@ -175,9 +200,9 @@ LTC_Slave::detect_discontinuity(LTCFrameExt *frame, int fps, bool fuzzy) {
 	}
 
 	if (frame->reverse) {
-		ltc_frame_decrement(&prev_frame.ltc, fps , 0);
+		ltc_frame_decrement(&prev_frame.ltc, fps, LTC_TV_525_60, 0);
 	} else {
-		ltc_frame_increment(&prev_frame.ltc, fps , 0);
+		ltc_frame_increment(&prev_frame.ltc, fps, LTC_TV_525_60, 0);
 	}
 	if (!equal_ltc_frame_time(&prev_frame.ltc, &frame->ltc)) {
 		discontinuity_detected = true;
@@ -273,6 +298,7 @@ void
 LTC_Slave::process_ltc(framepos_t const now)
 {
 	LTCFrameExt frame;
+	enum LTC_TV_STANDARD tv_standard = LTC_TV_625_50;
 	while (ltc_decoder_read(decoder, &frame)) {
 		SMPTETimecode stime;
 
@@ -312,15 +338,34 @@ LTC_Slave::process_ltc(framepos_t const now)
 		 * is expected to start at the end of the current frame
 		 */
 		int fps_i = ceil(timecode.rate);
+
+		switch(fps_i) {
+			case 30:
+				if (timecode.drop) {
+					tv_standard = LTC_TV_525_60;
+				} else {
+					tv_standard = LTC_TV_1125_60;
+				}
+				break;
+			case 25:
+				tv_standard = LTC_TV_625_50;
+				break;
+			default:
+				tv_standard = LTC_TV_FILM_24; /* == LTC_TV_1125_60 == no offset, 24,30fps BGF */
+				break;
+		}
+
 		if (!frame.reverse) {
-			ltc_frame_increment(&frame.ltc, fps_i , 0);
+			ltc_frame_increment(&frame.ltc, fps_i, tv_standard, 0);
 			ltc_frame_to_time(&stime, &frame.ltc, 0);
 			transport_direction = 1;
+			frame.off_start -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+			frame.off_end -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
 		} else {
-			ltc_frame_decrement(&frame.ltc, fps_i , 0);
+			ltc_frame_decrement(&frame.ltc, fps_i, tv_standard, 0);
 			int off = frame.off_end - frame.off_start;
-			frame.off_start += off;
-			frame.off_end += off;
+			frame.off_start += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+			frame.off_end += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
 			transport_direction = -1;
 		}
 
@@ -334,7 +379,7 @@ LTC_Slave::process_ltc(framepos_t const now)
 		Timecode::timecode_to_sample (timecode, ltc_frame, true, false,
 			double(session.frame_rate()),
 			session.config.get_subframes_per_frame(),
-			session.config.get_timecode_offset_negative(), session.config.get_timecode_offset()
+			timecode_negative_offset, timecode_offset
 			);
 
 		framepos_t cur_timestamp = frame.off_end + 1;
@@ -532,7 +577,7 @@ std::string
 LTC_Slave::approximate_current_position() const
 {
 	if (last_timestamp == 0) {
-		return " --:--:--:--";
+		return " \u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012";
 	}
 	return Timecode::timecode_format_time(timecode);
 }
@@ -540,14 +585,14 @@ LTC_Slave::approximate_current_position() const
 std::string
 LTC_Slave::approximate_current_delta() const
 {
-	char delta[24];
+	char delta[80];
 	if (last_timestamp == 0 || engine_dll_initstate == 0) {
 		snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
 	} else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) {
-		snprintf(delta, sizeof(delta), "flywheel");
+		snprintf(delta, sizeof(delta), _("flywheel"));
 	} else {
-		snprintf(delta, sizeof(delta), "%s%4" PRIi64 " sm",
-				PLUSMINUS(-current_delta), abs(current_delta));
+		snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm",
+				LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
 	}
 	return std::string(delta);
 }
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 3b6f6626ff..8dccc25e0d 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -19,6 +19,7 @@
 
 #include <string>
 #include <vector>
+#include <limits>
 
 #include <cmath>
 #include <cstdlib>
@@ -51,7 +52,9 @@
 #include <lilv/lilv.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
 #include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
@@ -69,27 +72,36 @@
 #include <suil/suil.h>
 #endif
 
+/** The number of MIDI buffers that will fit in a UI/worker comm buffer.
+    This needs to be roughly the number of cycles the UI will get around to
+    actually processing the traffic.  Lower values are flakier but save memory.
+*/
+static const size_t NBUFS = 4;
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
 URIMap LV2Plugin::_uri_map;
-uint32_t LV2Plugin::_midi_event_type = _uri_map.uri_to_id(
-	"http://lv2plug.in/ns/ext/midi#MidiEvent");
-uint32_t LV2Plugin::_chunk_type = _uri_map.uri_to_id(
-	LV2_ATOM__Chunk);
-uint32_t LV2Plugin::_sequence_type = _uri_map.uri_to_id(
-	LV2_ATOM__Sequence);
-uint32_t LV2Plugin::_event_transfer_type = _uri_map.uri_to_id(
-	LV2_ATOM__eventTransfer);
-uint32_t LV2Plugin::_path_type = _uri_map.uri_to_id(
-	LV2_ATOM__Path);
-uint32_t LV2Plugin::_log_Error = _uri_map.uri_to_id(
-	LV2_LOG__Error);
-uint32_t LV2Plugin::_log_Warning = _uri_map.uri_to_id(
-	LV2_LOG__Warning);
-uint32_t LV2Plugin::_log_Note = _uri_map.uri_to_id(
-	LV2_LOG__Note);
+
+LV2Plugin::URIDs LV2Plugin::urids = {
+	_uri_map.uri_to_id(LV2_ATOM__Chunk),
+	_uri_map.uri_to_id(LV2_ATOM__Path),
+	_uri_map.uri_to_id(LV2_ATOM__Sequence),
+	_uri_map.uri_to_id(LV2_ATOM__eventTransfer),
+	_uri_map.uri_to_id(LV2_LOG__Error),
+	_uri_map.uri_to_id(LV2_LOG__Note),
+	_uri_map.uri_to_id(LV2_LOG__Warning),
+	_uri_map.uri_to_id(LV2_MIDI__MidiEvent),
+	_uri_map.uri_to_id(LV2_TIME__Position),
+	_uri_map.uri_to_id(LV2_TIME__bar),
+	_uri_map.uri_to_id(LV2_TIME__barBeat),
+	_uri_map.uri_to_id(LV2_TIME__beatUnit),
+	_uri_map.uri_to_id(LV2_TIME__beatsPerBar),
+	_uri_map.uri_to_id(LV2_TIME__beatsPerMinute),
+	_uri_map.uri_to_id(LV2_TIME__frame),
+	_uri_map.uri_to_id(LV2_TIME__speed)
+};
 
 class LV2World : boost::noncopyable {
 public:
@@ -102,8 +114,8 @@ public:
 	LilvNode* atom_Chunk;
 	LilvNode* atom_Sequence;
 	LilvNode* atom_bufferType;
-	LilvNode* atom_supports;
 	LilvNode* atom_eventTransfer;
+	LilvNode* atom_supports;
 	LilvNode* ev_EventPort;
 	LilvNode* ext_logarithmic;
 	LilvNode* lv2_AudioPort;
@@ -117,6 +129,7 @@ public:
 	LilvNode* lv2_toggled;
 	LilvNode* midi_MidiEvent;
 	LilvNode* rdfs_comment;
+	LilvNode* time_Position;
 	LilvNode* ui_GtkUI;
 	LilvNode* ui_external;
 };
@@ -169,14 +182,14 @@ log_vprintf(LV2_Log_Handle handle,
 {
 	char* str = NULL;
 	const int ret = g_vasprintf(&str, fmt, args);
-	if (type == LV2Plugin::_log_Error) {
+	if (type == LV2Plugin::urids.log_Error) {
 		error << str << endmsg;
-	} else if (type == LV2Plugin::_log_Warning) {
+	} else if (type == LV2Plugin::urids.log_Warning) {
 		warning << str << endmsg;
-	} else if (type == LV2Plugin::_log_Note) {
+	} else if (type == LV2Plugin::urids.log_Note) {
 		info << str << endmsg;
 	}
-	// TODO: Togglable log:Trace message support
+	// TODO: Toggleable log:Trace message support
 	return ret;
 }
 
@@ -211,6 +224,7 @@ struct LV2Plugin::Impl {
 	LilvInstance*               instance;
 	const LV2_Worker_Interface* work_iface;
 	LilvState*                  state;
+	LV2_Atom_Forge              forge;
 };
 
 LV2Plugin::LV2Plugin (AudioEngine& engine,
@@ -260,6 +274,8 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 	_bpm_control_port       = 0;
 	_freewheel_control_port = 0;
 	_latency_control_port   = 0;
+	_next_cycle_start       = std::numeric_limits<framepos_t>::max();
+	_next_cycle_speed       = 1.0;
 	_block_length           = _engine.frames_per_cycle();
 	_seq_size               = _engine.raw_buffer_size(DataType::MIDI);
 	_state_version          = 0;
@@ -294,6 +310,8 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 	_features[5] = _uri_map.urid_unmap_feature();
 	_features[6] = &_log_feature;
 
+	lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map());
+
 	unsigned n_features = 7;
 #ifdef HAVE_NEW_LV2
 	LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
@@ -328,7 +346,8 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 	if (lilv_plugin_has_feature(plugin, worker_schedule)) {
 		LV2_Worker_Schedule* schedule = (LV2_Worker_Schedule*)malloc(
 			sizeof(LV2_Worker_Schedule));
-		_worker                     = new Worker(this, 4096);
+		size_t buf_size = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
+		_worker                     = new Worker(this, buf_size);
 		schedule->handle            = this;
 		schedule->schedule_work     = work_schedule;
 		_work_schedule_feature.data = schedule;
@@ -385,19 +404,22 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 			flags |= PORT_AUDIO;
 		} else if (lilv_port_is_a(_impl->plugin, port, _world.ev_EventPort)) {
 			flags |= PORT_EVENT;
+			flags |= PORT_MIDI;  // We assume old event API ports are for MIDI
 		} else if (lilv_port_is_a(_impl->plugin, port, _world.atom_AtomPort)) {
 			LilvNodes* buffer_types = lilv_port_get_value(
 				_impl->plugin, port, _world.atom_bufferType);
 			LilvNodes* atom_supports = lilv_port_get_value(
 				_impl->plugin, port, _world.atom_supports);
 
-				if (lilv_nodes_contains(buffer_types, _world.atom_Sequence)
-						&& lilv_nodes_contains(atom_supports, _world.midi_MidiEvent)
-						) {
-					flags |= PORT_MESSAGE;
-				} else {
-					flags |= PORT_ATOM;
+			if (lilv_nodes_contains(buffer_types, _world.atom_Sequence)) {
+				flags |= PORT_SEQUENCE;
+				if (lilv_nodes_contains(atom_supports, _world.midi_MidiEvent)) {
+					flags |= PORT_MIDI;
 				}
+				if (lilv_nodes_contains(atom_supports, _world.time_Position)) {
+					flags |= PORT_POSITION;
+				}
+			}
 			lilv_nodes_free(buffer_types);
 			lilv_nodes_free(atom_supports);
 		} else {
@@ -801,9 +823,6 @@ LV2Plugin::lv2_state_make_path(LV2_State_Make_Path_Handle handle,
 	DEBUG_TRACE(DEBUG::LV2, string_compose("new file path %1 => %2\n",
 	                                       path, abs_path));
 
-	std::cerr << "MAKE PATH " << path
-	          << " => " << g_strndup(abs_path.c_str(), abs_path.length())
-	          << std::endl;
 	return g_strndup(abs_path.c_str(), abs_path.length());
 }
 
@@ -848,13 +867,10 @@ LV2Plugin::add_state(XMLNode* root) const
 	}
 
 	if (_has_state_interface) {
-		cout << "LV2 " << name() << " has state interface" << endl;
 		// Provisionally increment state version and create directory
 		const std::string new_dir = state_dir(++_state_version);
 		g_mkdir_with_parents(new_dir.c_str(), 0744);
 
-		cout << "NEW DIR: " << new_dir << endl;
-
 		LilvState* state = lilv_state_new_from_instance(
 			_impl->plugin,
 			_impl->instance,
@@ -864,7 +880,7 @@ LV2Plugin::add_state(XMLNode* root) const
 			_session.externals_dir().c_str(),
 			new_dir.c_str(),
 			NULL,
-			(void*)this,
+			const_cast<LV2Plugin*>(this),
 			0,
 			NULL);
 
@@ -879,19 +895,14 @@ LV2Plugin::add_state(XMLNode* root) const
 
 			lilv_state_free(_impl->state);
 			_impl->state = state;
-
-			cout << "Saved LV2 state to " << state_dir(_state_version) << endl;
 		} else {
 			// State is identical, decrement version and nuke directory
-			cout << "LV2 state identical, not saving" << endl;
 			lilv_state_free(state);
 			remove_directory(new_dir);
 			--_state_version;
 		}
 
 		root->add_property("state-dir", string_compose("state%1", _state_version));
-	} else {
-		cout << "LV2 " << name() << " has no state interface." << endl;
 	}
 }
 
@@ -973,7 +984,6 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
                                  uint32_t*   size,
                                  uint32_t*   type)
 {
-	// cerr << "get_port_value(" << port_symbol << ", ...) ... ";
 	LV2Plugin *plugin = (LV2Plugin *) user_data;
 
 	uint32_t index = plugin->port_index(port_symbol);
@@ -983,14 +993,11 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
 			*size = sizeof(float);
 			*type = plugin->_uri_map.uri_to_id(LV2_ATOM__Float);
 			value = &plugin->_shadow_data[index];
-			// cerr << "index="<< index << ",*size=" << *size << ",*type=" << *type << ",*value=" << *value << endl;
 
 			return value;
 		}
-		// cerr << "port is not input control port! ";
 	}
 
-	// cerr << "returning NULL!" << endl;
 	*size = *type = 0;
 	return NULL;
 }
@@ -999,8 +1006,6 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
 std::string
 LV2Plugin::do_save_preset(string name)
 {
-	// cerr << "LV2Plugin::do_save_preset(" << name << ")" << endl;
-
 	string pset_uri = uri();
 	pset_uri += "#";
 	pset_uri += name;
@@ -1062,20 +1067,15 @@ bool
 LV2Plugin::has_message_output() const
 {
 	for (uint32_t i = 0; i < num_ports(); ++i) {
-		if ((_port_flags[i] & (PORT_MESSAGE|PORT_ATOM)) && _port_flags[i] & PORT_OUTPUT) {
+		if ((_port_flags[i] & PORT_SEQUENCE) &&
+		    (_port_flags[i] & PORT_OUTPUT)) {
 			return true;
 		}
 	}
 	return false;
 }
 
-uint32_t
-LV2Plugin::atom_eventTransfer() const
-{
-	return _event_transfer_type;
-}
-
-void
+bool
 LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
                     uint32_t             index,
                     uint32_t             protocol,
@@ -1091,38 +1091,46 @@ LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
 	msg->size     = size;
 	memcpy(msg + 1, body, size);
 
-	if (dest->write(buf, buf_size) != buf_size) {
-		error << "Error writing to UI=>Plugin RingBuffer" << endmsg;
-	}
+	return (dest->write(buf, buf_size) == buf_size);
 }
 
-void
+bool
 LV2Plugin::write_from_ui(uint32_t       index,
                          uint32_t       protocol,
                          uint32_t       size,
                          const uint8_t* body)
 {
 	if (!_from_ui) {
-		_from_ui = new RingBuffer<uint8_t>(4096);
+		_from_ui = new RingBuffer<uint8_t>(
+			_session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
 	}
 
-	write_to(_from_ui, index, protocol, size, body);
+	if (!write_to(_from_ui, index, protocol, size, body)) {
+		error << "Error writing from UI to plugin" << endmsg;
+		return false;
+	}
+	return true;
 }
 
-void
+bool
 LV2Plugin::write_to_ui(uint32_t       index,
                        uint32_t       protocol,
                        uint32_t       size,
                        const uint8_t* body)
 {
-	write_to(_to_ui, index, protocol, size, body);
+	if (!write_to(_to_ui, index, protocol, size, body)) {
+		error << "Error writing from plugin to UI" << endmsg;
+		return false;
+	}
+	return true;
 }
 
 void
 LV2Plugin::enable_ui_emmission()
 {
 	if (!_to_ui) {
-		_to_ui = new RingBuffer<uint8_t>(4096);
+		_to_ui = new RingBuffer<uint8_t>(
+			_session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
 	}
 }
 
@@ -1237,7 +1245,6 @@ LV2Plugin::set_state(const XMLNode& node, int version)
 			plugin_dir(),
 			Glib::build_filename(prop->value(), "state.ttl"));
 
-		cout << "Loading LV2 state from " << state_file << endl;
 		LilvState* state = lilv_state_new_from_file(
 			_world.world, _uri_map.urid_map(), NULL, state_file.c_str());
 
@@ -1408,12 +1415,50 @@ LV2Plugin::allocate_atom_event_buffers()
 	_atom_ev_buffers = (LV2_Evbuf**) malloc((total_atom_buffers + 1) * sizeof(LV2_Evbuf*));
 	for (int i = 0; i < total_atom_buffers; ++i ) {
 		_atom_ev_buffers[i] = lv2_evbuf_new(32768, LV2_EVBUF_ATOM,
-				LV2Plugin::_chunk_type, LV2Plugin::_sequence_type);
+				LV2Plugin::urids.atom_Chunk, LV2Plugin::urids.atom_Sequence);
 	}
 	_atom_ev_buffers[total_atom_buffers] = 0;
 	return;
 }
 
+/** Write an ardour position/time/tempo/meter as an LV2 event.
+ * @return true on success.
+ */
+static bool
+write_position(LV2_Atom_Forge*     forge,
+               LV2_Evbuf*          buf,
+               const TempoMetric&  t,
+               Timecode::BBT_Time& bbt,
+               double              speed,
+               framepos_t          position,
+               framecnt_t          offset)
+{
+	uint8_t pos_buf[256];
+	lv2_atom_forge_set_buffer(forge, pos_buf, sizeof(pos_buf));
+	LV2_Atom_Forge_Frame frame;
+	lv2_atom_forge_blank(forge, &frame, 1, LV2Plugin::urids.time_Position);
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_frame, 0);
+	lv2_atom_forge_long(forge, position);
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_speed, 0);
+	lv2_atom_forge_float(forge, speed);
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_barBeat, 0);
+	lv2_atom_forge_float(forge, bbt.beats - 1 +
+	                     (bbt.ticks / Timecode::BBT_Time::ticks_per_beat));
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_bar, 0);
+	lv2_atom_forge_float(forge, bbt.bars - 1);
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatUnit, 0);
+	lv2_atom_forge_float(forge, t.meter().note_divisor());
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatsPerBar, 0);
+	lv2_atom_forge_float(forge, t.meter().divisions_per_bar());
+	lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatsPerMinute, 0);
+	lv2_atom_forge_float(forge, t.tempo().beats_per_minute());
+
+	LV2_Evbuf_Iterator    end  = lv2_evbuf_end(buf);
+	const LV2_Atom* const atom = (const LV2_Atom*)pos_buf;
+	return lv2_evbuf_write(&end, offset, 0, atom->type, atom->size,
+	                       (const uint8_t*)(atom + 1));
+}
+
 int
 LV2Plugin::connect_and_run(BufferSet& bufs,
 	ChanMapping in_map, ChanMapping out_map,
@@ -1424,14 +1469,16 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 
 	cycles_t then = get_cycles();
 
+	TempoMap&               tmap     = _session.tempo_map();
+	Metrics::const_iterator metric_i = tmap.metrics_end();
+	TempoMetric             tmetric  = tmap.metric_at(_session.transport_frame(), &metric_i);
+
 	if (_freewheel_control_port) {
-		*_freewheel_control_port = _session.engine().freewheeling ();
+		*_freewheel_control_port = _session.engine().freewheeling();
 	}
 
 	if (_bpm_control_port) {
-		TempoMap& tmap (_session.tempo_map ());
-		Tempo tempo = tmap.tempo_at (_session.transport_frame () + offset);
-		*_bpm_control_port = tempo.beats_per_minute ();
+		*_bpm_control_port = tmetric.tempo().beats_per_minute();
 	}
 
 	ChanCount bufs_count;
@@ -1440,17 +1487,18 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 	BufferSet& silent_bufs  = _session.get_silent_buffers(bufs_count);
 	BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count);
 	uint32_t const num_ports = parameter_count();
+	uint32_t const nil_index = std::numeric_limits<uint32_t>::max();
 
 	uint32_t audio_in_index  = 0;
 	uint32_t audio_out_index = 0;
 	uint32_t midi_in_index   = 0;
 	uint32_t midi_out_index  = 0;
 	uint32_t atom_port_index = 0;
-	bool valid;
 	for (uint32_t port_index = 0; port_index < num_ports; ++port_index) {
 		void*     buf   = NULL;
-		uint32_t  index = 0;
+		uint32_t  index = nil_index;
 		PortFlags flags = _port_flags[port_index];
+		bool      valid = false;
 		if (flags & PORT_AUDIO) {
 			if (flags & PORT_INPUT) {
 				index = in_map.get(DataType::AUDIO, audio_in_index++, &valid);
@@ -1463,35 +1511,78 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 					? bufs.get_audio(index).data(offset)
 					: scratch_bufs.get_audio(0).data(offset);
 			}
-		} else if (flags & (PORT_EVENT|PORT_MESSAGE)) {
+		} else if (flags & (PORT_EVENT|PORT_SEQUENCE)) {
 			/* FIXME: The checks here for bufs.count().n_midi() > index shouldn't
 			   be necessary, but the mapping is illegal in some cases.  Ideally
 			   that should be fixed, but this is easier...
 			*/
-			if (flags & PORT_INPUT) {
-				index = in_map.get(DataType::MIDI, midi_in_index++, &valid);
-				_ev_buffers[port_index] = (valid && bufs.count().n_midi() > index)
-					? bufs.get_lv2_midi(true, index, flags & PORT_EVENT)
-					: silent_bufs.get_lv2_midi(true, 0, flags & PORT_EVENT);
-				buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
-			} else {
-				index = out_map.get(DataType::MIDI, midi_out_index++, &valid);
-				_ev_buffers[port_index] = (valid && bufs.count().n_midi() > index)
-					? bufs.get_lv2_midi(false, index, flags & PORT_EVENT)
-					: scratch_bufs.get_lv2_midi(false, 0, flags & PORT_EVENT);
-				buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
-			}
-		} else if (flags & (PORT_ATOM)) {
-			assert(_atom_ev_buffers && _atom_ev_buffers[atom_port_index]);
-			if (flags & PORT_INPUT) {
+			if (flags & PORT_MIDI) {
+				if (flags & PORT_INPUT) {
+					index = in_map.get(DataType::MIDI, midi_in_index++, &valid);
+				} else {
+					index = out_map.get(DataType::MIDI, midi_out_index++, &valid);
+				}
+				if (valid && bufs.count().n_midi() > index) {
+					_ev_buffers[port_index] = bufs.get_lv2_midi(
+						(flags & PORT_INPUT), index, (flags & PORT_EVENT));
+				}
+			} else if ((flags & PORT_POSITION) && (flags & PORT_INPUT)) {
 				lv2_evbuf_reset(_atom_ev_buffers[atom_port_index], true);
 				_ev_buffers[port_index] = _atom_ev_buffers[atom_port_index++];
-			} else {
-				lv2_evbuf_reset(_atom_ev_buffers[atom_port_index], false);
-				_ev_buffers[port_index] = _atom_ev_buffers[atom_port_index++];
+				valid                   = true;
+			}
+
+			if (valid && (flags & PORT_INPUT)) {
+				Timecode::BBT_Time bbt;
+				if ((flags & PORT_POSITION)) {
+					if (_session.transport_frame() != _next_cycle_start ||
+					    _session.transport_speed() != _next_cycle_speed) {
+						// Transport has changed, write position at cycle start
+						tmap.bbt_time(_session.transport_frame(), bbt);
+						write_position(&_impl->forge, _ev_buffers[port_index],
+						               tmetric, bbt, _session.transport_speed(),
+						               _session.transport_frame(), 0);
+					}
+				}
+
+				// Get MIDI iterator range (empty range if no MIDI)
+				MidiBuffer::iterator m = (index != nil_index)
+					? bufs.get_midi(index).begin()
+					: silent_bufs.get_midi(0).end();
+				MidiBuffer::iterator m_end = (index != nil_index)
+					? bufs.get_midi(index).end()
+					: m;
+
+				// Now merge MIDI and any transport events into the buffer
+				LV2_Evbuf_Iterator i    = lv2_evbuf_end(_ev_buffers[port_index]);
+				const uint32_t     type = LV2Plugin::urids.midi_MidiEvent;
+				const framepos_t   tend = _session.transport_frame() + nframes;
+				++metric_i;
+				while (m != m_end || (metric_i != tmap.metrics_end() &&
+				                      (*metric_i)->frame() < tend)) {
+					MetricSection* metric = (metric_i != tmap.metrics_end())
+						? *metric_i : NULL;
+					if (m != m_end && (!metric || metric->frame() > (*m).time())) {
+						const Evoral::MIDIEvent<framepos_t> ev(*m, false);
+						LV2_Evbuf_Iterator eend = lv2_evbuf_end(_ev_buffers[port_index]);
+						lv2_evbuf_write(&eend, ev.time(), 0, type, ev.size(), ev.buffer());
+						++m;
+					} else {
+						tmetric.set_metric(metric);
+						bbt = metric->start();
+						write_position(&_impl->forge, _ev_buffers[port_index],
+						               tmetric, bbt, _session.transport_speed(),
+						               metric->frame(),
+						               metric->frame() - _session.transport_frame());
+						++metric_i;
+					}
+				}
+			} else if (!valid) {
+				// Nothing we understand or care about, connect to scratch
+				_ev_buffers[port_index] = silent_bufs.get_lv2_midi(
+					(flags & PORT_INPUT), 0, (flags & PORT_EVENT));
 			}
 			buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
-			assert(buf);
 		} else {
 			continue;  // Control port, leave buffer alone
 		}
@@ -1512,13 +1603,13 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 				error << "Error reading from UI=>Plugin RingBuffer" << endmsg;
 				break;
 			}
-			if (msg.protocol == _event_transfer_type) {
+			if (msg.protocol == urids.atom_eventTransfer) {
 				LV2_Evbuf*            buf  = _ev_buffers[msg.index];
 				LV2_Evbuf_Iterator    i    = lv2_evbuf_end(buf);
 				const LV2_Atom* const atom = (const LV2_Atom*)body;
 				if (!lv2_evbuf_write(&i, nframes, 0, atom->type, atom->size,
 				                (const uint8_t*)(atom + 1))) {
-					cerr << "LV2: failed to write data to event buffer\n";
+					error << "Failed to write data to LV2 event buffer\n";
 				}
 			} else {
 				error << "Received unknown message type from UI" << endmsg;
@@ -1532,9 +1623,10 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 	midi_out_index = 0;
 	for (uint32_t port_index = 0; port_index < num_ports; ++port_index) {
 		PortFlags flags = _port_flags[port_index];
+		bool      valid = false;
 
 		// Flush MIDI (write back to Ardour MIDI buffers)
-		if ((flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_MESSAGE))) {
+		if ((flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_SEQUENCE))) {
 			const uint32_t buf_index = out_map.get(
 				DataType::MIDI, midi_out_index++, &valid);
 			if (valid) {
@@ -1543,7 +1635,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 		}
 
 		// Write messages to UI
-		if (_to_ui && (flags & PORT_OUTPUT) && (flags & (PORT_MESSAGE|PORT_ATOM))) {
+		if (_to_ui && (flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_SEQUENCE))) {
 			LV2_Evbuf* buf = _ev_buffers[port_index];
 			for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(buf);
 			     lv2_evbuf_is_valid(i);
@@ -1551,7 +1643,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 				uint32_t frames, subframes, type, size;
 				uint8_t* data;
 				lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data);
-				write_to_ui(port_index, _event_transfer_type,
+				write_to_ui(port_index, urids.atom_eventTransfer,
 				            size + sizeof(LV2_Atom),
 				            data - sizeof(LV2_Atom));
 			}
@@ -1561,6 +1653,10 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 	cycles_t now = get_cycles();
 	set_cycles((uint32_t)(now - then));
 
+	// Update expected transport information for next cycle so we can detect changes
+	_next_cycle_speed = _session.transport_speed();
+	_next_cycle_start = _session.transport_frame() + (nframes * _next_cycle_speed);
+
 	return 0;
 }
 
@@ -1736,6 +1832,7 @@ LV2World::LV2World()
 	lv2_enumeration    = lilv_new_uri(world, LV2_CORE__enumeration);
 	midi_MidiEvent     = lilv_new_uri(world, LILV_URI_MIDI_EVENT);
 	rdfs_comment       = lilv_new_uri(world, LILV_NS_RDFS "comment");
+	time_Position      = lilv_new_uri(world, LV2_TIME__Position);
 	ui_GtkUI           = lilv_new_uri(world, LV2_UI__GtkUI);
 	ui_external        = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/ui#external");
 }
@@ -1803,8 +1900,10 @@ LV2PluginInfo::discover()
 		LV2PluginInfoPtr  info(new LV2PluginInfo((const void*)p));
 
 		LilvNode* name = lilv_plugin_get_name(p);
-		if (!name) {
-			cerr << "LV2: invalid plugin\n";
+		if (!name || !lilv_plugin_get_port_by_index(p, 0)) {
+			warning << "Ignoring invalid LV2 plugin "
+			        << lilv_node_as_string(lilv_plugin_get_uri(p))
+			        << endmsg;
 			continue;
 		}
 
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index a54965557a..ef2d22ab18 100644
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -359,12 +359,12 @@ MIDIClock_Slave::resolution() const
 std::string
 MIDIClock_Slave::approximate_current_delta() const
 {
-	char delta[24];
+	char delta[80];
 	if (last_timestamp == 0 || _starting) {
 		snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
 	} else {
-		snprintf(delta, sizeof(delta), "%s%4" PRIi64 " sm",
-				PLUSMINUS(-current_delta), abs(current_delta));
+		snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm",
+				LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
 	}
 	return std::string(delta);
 }
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index d7ec6eb24e..dcc51ee5c8 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -66,6 +66,8 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 	a3e_timecode = session.config.get_timecode_format();
 	printed_timecode_warning = false;
 
+	session.config.ParameterChanged.connect_same_thread (config_connection, boost::bind (&MTC_Slave::parameter_changed, this, _1));
+	parse_timecode_offset();
 	reset (true);
 	rebind (p);
 }
@@ -73,6 +75,7 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 MTC_Slave::~MTC_Slave()
 {
 	port_connections.drop_connections();
+	config_connection.disconnect();
 
 	while (busy_guard1 != busy_guard2) {
 		/* make sure MIDI parser is not currently calling any callbacks in here,
@@ -101,6 +104,27 @@ MTC_Slave::rebind (MIDI::Port& p)
 	port->parser()->mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
 }
 
+void
+MTC_Slave::parse_timecode_offset() {
+	Timecode::Time offset_tc;
+	Timecode::parse_timecode_format(session.config.get_slave_timecode_offset(), offset_tc);
+	offset_tc.rate = session.timecode_frames_per_second();
+	offset_tc.drop = session.timecode_drop_frames();
+	session.timecode_to_sample(offset_tc, timecode_offset, false, false);
+	timecode_negative_offset = offset_tc.negative;
+}
+
+void
+MTC_Slave::parameter_changed (std::string const & p)
+{
+	if (p == "slave-timecode-offset"
+			|| p == "subframes-per-frame"
+			|| p == "timecode-format"
+			) {
+		parse_timecode_offset();
+	}
+}
+
 bool
 MTC_Slave::give_slave_full_control_over_transport_speed() const
 {
@@ -390,7 +414,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 	Timecode::timecode_to_sample (timecode, mtc_frame, true, false,
 		double(session.frame_rate()),
 		session.config.get_subframes_per_frame(),
-		session.config.get_timecode_offset_negative(), session.config.get_timecode_offset()
+		timecode_negative_offset, timecode_offset
 		);
 
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC at %1 TC %2 = mtc_frame %3 (from full message ? %4) tc-ratio %5\n",
@@ -661,7 +685,7 @@ MTC_Slave::approximate_current_position() const
 	SafeTime last;
 	read_current (&last);
 	if (last.timestamp == 0 || reset_pending) {
-		return " --:--:--:--";
+		return " \u2012\u2012:\u2012\u2012:\u2012\u2012:\u2012\u2012";
 	}
 	return Timecode::timecode_format_sampletime(
 		last.position,
@@ -673,15 +697,14 @@ MTC_Slave::approximate_current_position() const
 std::string
 MTC_Slave::approximate_current_delta() const
 {
-	char delta[24];
+	char delta[80];
 	SafeTime last;
 	read_current (&last);
 	if (last.timestamp == 0 || reset_pending) {
 		snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
 	} else {
-		// TODO if current_delta > 1 frame -> display timecode.
-		snprintf(delta, sizeof(delta), "%s%4" PRIi64 " sm",
-				PLUSMINUS(-current_delta), abs(current_delta));
+		snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span> sm",
+				LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
 	}
 	return std::string(delta);
 }
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index a26f55f6a9..499caaccc0 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -217,12 +217,13 @@ Route::set_remote_control_id (uint32_t id, bool notify_class_listeners)
 	if (Config->get_remote_model() != UserOrdered) {
 		return;
 	}
-	
-	if (id < 1) {
-		error << _("Remote Control ID's start at one, not zero") << endmsg;
-		return;
-	}
 
+	set_remote_control_id_internal (id, notify_class_listeners);
+}
+
+void
+Route::set_remote_control_id_internal (uint32_t id, bool notify_class_listeners)
+{
 	/* force IDs for master/monitor busses and prevent 
 	   any other route from accidentally getting these IDs
 	   (i.e. legacy sessions)
@@ -236,6 +237,10 @@ Route::set_remote_control_id (uint32_t id, bool notify_class_listeners)
 		id = MonitorBusRemoteControlID;
 	}
 
+	if (id < 1) {
+		return;
+	}
+
 	/* don't allow it to collide */
 
 	if (!is_master () && !is_monitor() && 
@@ -676,6 +681,7 @@ void
 Route::set_solo (bool yn, void *src)
 {
 	if (_solo_safe) {
+		DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 ignore solo change due to solo-safe\n", name()));
 		return;
 	}
 
@@ -684,6 +690,9 @@ Route::set_solo (bool yn, void *src)
 		return;
 	}
 
+	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: set solo => %2, src: %3 grp ? %4 currently self-soloed ? %5\n", 
+						  name(), yn, src, (src == _route_group), self_soloed()));
+
 	if (self_soloed() != yn) {
 		set_self_solo (yn);
 		set_mute_master_solo ();
@@ -695,6 +704,7 @@ Route::set_solo (bool yn, void *src)
 void
 Route::set_self_solo (bool yn)
 {
+	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: set SELF solo => %2\n", name(), yn));
 	_self_solo = yn;
 }
 
@@ -702,9 +712,13 @@ void
 Route::mod_solo_by_others_upstream (int32_t delta)
 {
 	if (_solo_safe) {
+		DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 ignore solo-by-upstream due to solo-safe\n", name()));
 		return;
 	}
 
+	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-upstream by %2, current up = %3 down = %4\n", 
+						  name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream));
+
 	uint32_t old_sbu = _soloed_by_others_upstream;
 
 	if (delta < 0) {
@@ -758,9 +772,13 @@ void
 Route::mod_solo_by_others_downstream (int32_t delta)
 {
 	if (_solo_safe) {
+		DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 ignore solo-by-downstream due to solo safe\n", name()));
 		return;
 	}
 
+	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-downstream by %2, current up = %3 down = %4\n", 
+						  name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream));
+
 	if (delta < 0) {
 		if (_soloed_by_others_downstream >= (uint32_t) abs (delta)) {
 			_soloed_by_others_downstream += delta;
@@ -2181,7 +2199,7 @@ Route::set_state (const XMLNode& node, int version)
 			if ((prop = child->property (X_("id"))) != 0) {
 				int32_t x;
 				sscanf (prop->value().c_str(), "%d", &x);
-				set_remote_control_id (x);
+				set_remote_control_id_internal (x);
 			}
 
 		} else if (child->name() == X_("MuteMaster")) {
@@ -2219,6 +2237,10 @@ Route::set_state_2X (const XMLNode& node, int version)
 		_flags = Flag (0);
 	}
 
+	if (is_master() || is_monitor() || is_hidden()) {
+		_mute_master->set_solo_ignore (true);
+	}
+
 	if ((prop = node.property (X_("phase-invert"))) != 0) {
 		boost::dynamic_bitset<> p (_input->n_ports().n_audio ());
 		if (string_is_affirmative (prop->value ())) {
@@ -2442,7 +2464,7 @@ Route::set_state_2X (const XMLNode& node, int version)
 			if ((prop = child->property (X_("id"))) != 0) {
 				int32_t x;
 				sscanf (prop->value().c_str(), "%d", &x);
-				set_remote_control_id (x);
+				set_remote_control_id_internal (x);
 			}
 
 		}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index d1177be646..f396cf00b2 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1342,8 +1342,6 @@ Session::set_frame_rate (framecnt_t frames_per_second)
 
 	sync_time_vars();
 
-	Automatable::set_automation_interval (ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
-
 	clear_clicks ();
 
 	// XXX we need some equivalent to this, somehow
@@ -2138,6 +2136,31 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
 
 void
 Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect, bool save)
+{
+	try {
+		PBD::Unwinder<bool> aip (_adding_routes_in_progress, true);
+		add_routes_inner (new_routes, input_auto_connect, output_auto_connect);
+
+	} catch (...) {
+		error << _("Adding new tracks/busses failed") << endmsg;
+	}
+
+	graph_reordered ();
+
+	update_latency (true);
+	update_latency (false);
+		
+	set_dirty();
+	
+	if (save) {
+		save_state (_current_snapshot_name);
+	}
+	
+	RouteAdded (new_routes); /* EMIT SIGNAL */
+}
+
+void
+Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect)
 {
         ChanCount existing_inputs;
         ChanCount existing_outputs;
@@ -2196,6 +2219,7 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
 			}
 		}
 
+
 		if (input_auto_connect || output_auto_connect) {
 			auto_connect_route (r, existing_inputs, existing_outputs, true, input_auto_connect);
 		}
@@ -2204,7 +2228,7 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
 		   reasonable defaults because they also affect the remote control
 		   ID in most situations.
 		*/
-		
+
 		if (!r->has_order_key (EditorSort)) {
 			if (r->is_hidden()) {
 				/* use an arbitrarily high value */
@@ -2220,31 +2244,18 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
 	}
 
 	if (_monitor_out && IO::connecting_legal) {
-
-		{
-			Glib::Threads::Mutex::Lock lm (_engine.process_lock());		
-			
-			for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-				if ((*x)->is_monitor()) {
+		Glib::Threads::Mutex::Lock lm (_engine.process_lock());		
+		
+		for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
+			if ((*x)->is_monitor()) {
+				/* relax */
+			} else if ((*x)->is_master()) {
 					/* relax */
-				} else if ((*x)->is_master()) {
-					/* relax */
-				} else {
-					(*x)->enable_monitor_send ();
-				}
+			} else {
+				(*x)->enable_monitor_send ();
 			}
 		}
-
-		resort_routes ();
 	}
-
-	set_dirty();
-
-	if (save) {
-		save_state (_current_snapshot_name);
-	}
-
-	RouteAdded (new_routes); /* EMIT SIGNAL */
 }
 
 void
@@ -2554,14 +2565,17 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
 		DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
 		
 		if ((*i)->feeds (route, &via_sends_only)) {
+			DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a feed from %1\n", (*i)->name()));
 			if (!via_sends_only) {
 				if (!route->soloed_by_others_upstream()) {
 					(*i)->mod_solo_by_others_downstream (delta);
 				}
+			} else {
+				DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a send-only feed from %1\n", (*i)->name()));
 			}
 			in_signal_flow = true;
 		} else {
-			DEBUG_TRACE (DEBUG::Solo, "\tno feed from\n");
+			DEBUG_TRACE (DEBUG::Solo, string_compose ("\tno feed from %1\n", (*i)->name()));
 		}
 		
 		DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
@@ -2582,7 +2596,11 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
 				if (!route->soloed_by_others_downstream()) {
 					DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta));
 					(*i)->mod_solo_by_others_upstream (delta);
+				} else {
+					DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others downstream\n");
 				}
+			} else {
+				DEBUG_TRACE (DEBUG::Solo, string_compose ("\tfeed to %1 ignored, sends-only\n", (*i)->name()));
 			}
 			in_signal_flow = true;
 		} else {
@@ -2604,7 +2622,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
 	*/
 
 	for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
-		DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1\n", (*i)->name()));
+		DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name()));
 		(*i)->mute_changed (this);
 	}
 
@@ -2654,6 +2672,9 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
 		_solo_isolated_cnt = isolated;
 		IsolatedChanged (); /* EMIT SIGNAL */
 	}
+
+	DEBUG_TRACE (DEBUG::Solo, string_compose ("solo state updated by session, soloed? %1 listeners %2 isolated %3\n",
+						  something_soloed, listeners, isolated));
 }
 
 boost::shared_ptr<RouteList>
@@ -2689,44 +2710,68 @@ Session::io_name_is_legal (const std::string& name)
 }
 
 void
-Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/)
+Session::set_exclusive_input_active (boost::shared_ptr<RouteList> rl, bool onoff, bool flip_others)
 {
-	RouteList rl;
+	RouteList rl2;
 	vector<string> connections;
 
-	PortSet& ps (rt->input()->ports());
+	/* if we are passed only a single route and we're not told to turn
+	 * others off, then just do the simple thing.
+	 */
 
-	for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) {
-		p->get_connections (connections);
-	}
-
-	for (vector<string>::iterator s = connections.begin(); s != connections.end(); ++s) {
-		routes_using_input_from (*s, rl);
-	}
-
-	/* scan all relevant routes to see if others are on or off */
-
-	bool others_are_already_on = false;
-
-	for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
-		if ((*r) != rt) {
-			boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
-			if (mt) {
-				if (mt->input_active()) {
-					others_are_already_on = true;
-					break;
-				}
-			}
+	if (flip_others == false && rl->size() == 1) {
+		boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (rl->front());
+		if (mt) {
+			mt->set_input_active (onoff);
+			return;
 		}
 	}
 
-	/* globally reverse other routes */
+	for (RouteList::iterator rt = rl->begin(); rt != rl->end(); ++rt) {
+
+		PortSet& ps ((*rt)->input()->ports());
+		
+		for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) {
+			p->get_connections (connections);
+		}
+		
+		for (vector<string>::iterator s = connections.begin(); s != connections.end(); ++s) {
+			routes_using_input_from (*s, rl2);
+		}
+		
+		/* scan all relevant routes to see if others are on or off */
+		
+		bool others_are_already_on = false;
+		
+		for (RouteList::iterator r = rl2.begin(); r != rl2.end(); ++r) {
 
-	for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
-		if ((*r) != rt) {
 			boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
-			if (mt) {
-				mt->set_input_active (!others_are_already_on);
+
+			if (!mt) {
+				continue;
+			}
+
+			if ((*r) != (*rt)) {
+				if (mt->input_active()) {
+					others_are_already_on = true;
+				}
+			} else {
+				/* this one needs changing */
+				mt->set_input_active (onoff);
+			}
+		}
+		
+		if (flip_others) {
+
+			/* globally reverse other routes */
+			
+			for (RouteList::iterator r = rl2.begin(); r != rl2.end(); ++r) {
+				if ((*r) != (*rt)) {
+					boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
+					if (mt) {
+						mt->set_input_active (!others_are_already_on);
+					}
+				}
 			}
 		}
 	}
@@ -2735,7 +2780,7 @@ Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_
 void
 Session::routes_using_input_from (const string& str, RouteList& rl)
 {
-	boost::shared_ptr<RouteList> r = routes.reader ();
+	boost::shared_ptr<RouteList> r = routes.reader();
 
 	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 		if ((*i)->input()->connected_to (str)) {
@@ -3522,7 +3567,7 @@ Session::graph_reordered ()
 	   from a set_state() call or creating new tracks. Ditto for deletion.
 	*/
 
-	if (_state_of_the_state & (InitialConnecting|Deletion)) {
+	if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
 		return;
 	}
 
@@ -4364,7 +4409,7 @@ Session::source_search_path (DataType type) const
 	if (session_dirs.size() == 1) {
 		switch (type) {
 		case DataType::AUDIO:
-			s.push_back ( _session_dir->sound_path());
+			s.push_back (_session_dir->sound_path());
 			break;
 		case DataType::MIDI:
 			s.push_back (_session_dir->midi_path());
@@ -4387,7 +4432,9 @@ Session::source_search_path (DataType type) const
 	if (type == DataType::AUDIO) {
 		const string sound_path_2X = _session_dir->sound_path_2X();
 		if (Glib::file_test (sound_path_2X, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
-			s.push_back (sound_path_2X);
+			if (find (s.begin(), s.end(), sound_path_2X) == s.end()) {
+				s.push_back (sound_path_2X);
+			}
 		}
 	}
 
@@ -4406,16 +4453,7 @@ Session::source_search_path (DataType type) const
 	}
 
 	for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-
-		vector<string>::iterator si;
-
-		for (si = s.begin(); si != s.end(); ++si) {
-			if ((*si) == *i) {
-				break;
-			}
-		}
-
-		if (si == s.end()) {
+		if (find (s.begin(), s.end(), *i) == s.end()) {
 			s.push_back (*i);
 		}
 	}
@@ -4509,7 +4547,7 @@ Session::update_latency (bool playback)
 {
 	DEBUG_TRACE (DEBUG::Latency, string_compose ("JACK latency callback: %1\n", (playback ? "PLAYBACK" : "CAPTURE")));
 
-	if (_state_of_the_state & (InitialConnecting|Deletion)) {
+	if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
 		return;
 	}
 
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index 0f7f280ef8..177598091e 100644
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -56,17 +56,22 @@ using namespace Timecode;
  * This filter is adaptive so that fast vari-speed signals
  * will not be affected by it.
  */
-#define LTC_RISE_TIME(speed) MIN (100, MAX(25, (4000000 / ((speed==0)?1:speed) / engine().frame_rate())))
+#define LTC_RISE_TIME(speed) MIN (100, MAX(40, (4000000 / ((speed==0)?1:speed) / engine().frame_rate())))
+
+#define TV_STANDARD(tcf) \
+	(timecode_to_frames_per_second(tcf)==25.0 ? LTC_TV_625_50 : \
+	 timecode_has_drop_frames(tcf)? LTC_TV_525_60 : LTC_TV_FILM_24)
 
 void
 Session::ltc_tx_initialize()
 {
 	ltc_enc_tcformat = config.get_timecode_format();
 
+	ltc_tx_parse_offset();
 	DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX init sr: %1 fps: %2\n", nominal_frame_rate(), timecode_to_frames_per_second(ltc_enc_tcformat)));
 	ltc_encoder = ltc_encoder_create(nominal_frame_rate(),
 			timecode_to_frames_per_second(ltc_enc_tcformat),
-			-2);
+			TV_STANDARD(ltc_enc_tcformat), 0);
 
 	ltc_encoder_set_bufsize(ltc_encoder, nominal_frame_rate(), 23.0);
 	ltc_encoder_set_filter(ltc_encoder, LTC_RISE_TIME(1.0));
@@ -118,6 +123,16 @@ Session::ltc_tx_reset()
 	ltc_encoder_reset(ltc_encoder);
 }
 
+void
+Session::ltc_tx_parse_offset() {
+	Timecode::Time offset_tc;
+	Timecode::parse_timecode_format(config.get_timecode_generator_offset(), offset_tc);
+	offset_tc.rate = timecode_frames_per_second();
+	offset_tc.drop = timecode_drop_frames();
+	timecode_to_sample(offset_tc, ltc_timecode_offset, false, false);
+	ltc_timecode_negative_offset = !offset_tc.negative;
+}
+
 void
 Session::ltc_tx_recalculate_position()
 {
@@ -135,7 +150,7 @@ Session::ltc_tx_recalculate_position()
 	Timecode::timecode_to_sample (a3tc, ltc_enc_pos, true, false,
 		(double)frame_rate(),
 		config.get_subframes_per_frame(),
-		config.get_timecode_offset_negative(), config.get_timecode_offset()
+		ltc_timecode_negative_offset, ltc_timecode_offset
 		);
 	restarting = false;
 }
@@ -197,13 +212,17 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 	TimecodeFormat cur_timecode = config.get_timecode_format();
 	if (cur_timecode != ltc_enc_tcformat) {
 		DEBUG_TRACE (DEBUG::LTC, string_compose("LTC TX1: TC format mismatch - reinit sr: %1 fps: %2\n", nominal_frame_rate(), timecode_to_frames_per_second(cur_timecode)));
-		if (ltc_encoder_reinit(ltc_encoder, nominal_frame_rate(), timecode_to_frames_per_second(cur_timecode), -2)) {
+		if (ltc_encoder_reinit(ltc_encoder, nominal_frame_rate(),
+					timecode_to_frames_per_second(cur_timecode), 
+					TV_STANDARD(cur_timecode), 0
+					)) {
 			PBD::error << _("LTC encoder: invalid framerate - LTC encoding is disabled for the remainder of this session.") << endmsg;
 			ltc_tx_cleanup();
 			return;
 		}
 		ltc_encoder_set_filter(ltc_encoder, LTC_RISE_TIME(ltc_speed));
 		ltc_enc_tcformat = cur_timecode;
+		ltc_tx_parse_offset();
 		ltc_tx_reset();
 	}
 
@@ -226,6 +245,9 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 	 */
 	framepos_t cycle_start_frame = (current_speed < 0) ? (start_frame - ltc_out_latency.max) : (start_frame + ltc_out_latency.max);
 
+	/* LTC TV standard offset */
+	cycle_start_frame -= ltc_frame_alignment(frames_per_timecode_frame(), TV_STANDARD(cur_timecode));
+
 	/* cycle-start may become negative due to latency compensation */
 	if (cycle_start_frame < 0) { cycle_start_frame = 0; }
 
@@ -365,14 +387,14 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 			timecode_drop_frames(),
 			(double)frame_rate(),
 			config.get_subframes_per_frame(),
-			config.get_timecode_offset_negative(), config.get_timecode_offset()
+			ltc_timecode_negative_offset, ltc_timecode_offset
 			);
 
 	/* convert timecode back to sample-position */
 	Timecode::timecode_to_sample (tc_start, tc_sample_start, true, false,
 		(double)frame_rate(),
 		config.get_subframes_per_frame(),
-		config.get_timecode_offset_negative(), config.get_timecode_offset()
+		ltc_timecode_negative_offset, ltc_timecode_offset
 		);
 
 	/* difference between current frame and TC frame in samples */
diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index ac3baf2008..b2c4640880 100644
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -252,7 +252,9 @@ SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr<Region> re
 		(*i)->get_region_list_equivalent_regions (region, result);
 }
 
-/** Return the number of playlists (not regions) that contain @a src */
+/** Return the number of playlists (not regions) that contain @a src
+ *  Important: this counts usage in both used and not-used playlists.
+ */
 uint32_t
 SessionPlaylists::source_use_count (boost::shared_ptr<const Source> src) const
 {
@@ -264,6 +266,14 @@ SessionPlaylists::source_use_count (boost::shared_ptr<const Source> src) const
                         break;
                 }
 	}
+
+	for (List::const_iterator p = unused_playlists.begin(); p != unused_playlists.end(); ++p) {
+                if ((*p)->uses_source (src)) {
+                        ++count;
+                        break;
+                }
+	}
+
 	return count;
 }
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 1a566ec20e..a1f457393a 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -206,6 +206,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	_play_range = false;
 	_exporting = false;
 	pending_abort = false;
+	_adding_routes_in_progress = false;
 	destructive_index = 0;
 	first_file_data_format_reset = true;
 	first_file_header_format_reset = true;
@@ -2586,7 +2587,7 @@ Session::find_all_sources_across_snapshots (set<string>& result, bool exclude_th
 		ripped = ripped.substr (0, ripped.length() - 1);
 	}
 
-	state_files = scanner (ripped, accept_all_state_files, (void *) 0, false, true);
+	state_files = scanner (ripped, accept_all_state_files, (void *) 0, true, true);
 
 	if (state_files == 0) {
 		/* impossible! */
@@ -3565,6 +3566,10 @@ Session::config_changed (std::string p, bool ours)
 		reconnect_ltc_input ();
 	} else if (p == "ltc-sink-port") {
 		reconnect_ltc_output ();
+#ifdef HAVE_LTC
+	} else if (p == "timecode-generator-offset") {
+		ltc_tx_parse_offset();
+#endif
 	}
 
 	set_dirty ();
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 9a1507831c..72d8fb1e89 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -51,7 +51,7 @@ Session::bbt_time (framepos_t when, Timecode::BBT_Time& bbt)
 
 /* Timecode TIME */
 
-float
+double
 Session::timecode_frames_per_second() const
 {
 	return Timecode::timecode_to_frames_per_second (config.get_timecode_format());
@@ -95,6 +95,9 @@ Session::sync_time_vars ()
 		}
 		break;
 	};
+#ifdef HAVE_LTC
+	ltc_tx_parse_offset();
+#endif
 }
 
 void
diff --git a/libs/ardour/sg_rack.cc b/libs/ardour/sg_rack.cc
index f030e6488a..77c116a9a6 100644
--- a/libs/ardour/sg_rack.cc
+++ b/libs/ardour/sg_rack.cc
@@ -53,7 +53,7 @@ SoundGridRack::SoundGridRack (Session& s, Route& r, const std::string& name)
                 _cluster_type = eClusterType_GroupTrack;
         }
 
-        int32_t process_group = 0;
+        int32_t process_group = 1;
 
         /* XXX eventually these need to be discovered from the route which sets them during a graph sort 
          */
@@ -66,7 +66,7 @@ SoundGridRack::SoundGridRack (Session& s, Route& r, const std::string& name)
                 process_group = 5;
         } else if (dynamic_cast<Track*>(&_route) == 0) {
                 /* this is a bus, and busses run after tracks */
-                process_group = 1;
+                process_group = 2;
         }
 
         if (SoundGrid::instance().add_rack (_cluster_type, process_group, r.n_outputs().n_audio(), _rack_id)) { 
@@ -86,6 +86,15 @@ SoundGridRack::~SoundGridRack ()
                 return;
         }
 
+        PortSet& ports (_route.output()->ports());
+
+        DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("Removing SG/JACK mapping for outputs of %1 with %2 outputs\n", 
+                                                       _route.name(), ports.num_ports()));
+
+        for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) {
+                SoundGrid::instance().drop_sg_jack_mapping (p->name());
+        }
+
         DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("Destroying SG Chainer for %1\n", _route.name()));
         (void) SoundGrid::instance().remove_rack (_cluster_type, _rack_id);
 }
@@ -127,6 +136,10 @@ SoundGridRack::make_connections ()
 
                 DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("Looking at output %1\n", p->name()));
 
+                if (channel > 0) {
+                        continue;
+                }
+
                 if (p->type() != DataType::AUDIO) {
                         continue;
                 }
@@ -189,9 +202,10 @@ SoundGridRack::make_connections ()
                         /* wire normal tracks and busses to the master bus */
 
                         SoundGrid::instance().connect (SoundGrid::TrackOutputPort (_rack_id, channel), 
-                                                       //SoundGrid::PseudoPhysicalOutputPort (channel)
-                                                       SoundGrid::BusInputPort (master_out->rack_id(), channel));
+                                                       SoundGrid::PseudoPhysicalOutputPort (channel));
+                                                       //SoundGrid::BusInputPort (master_out->rack_id(), channel));
                 }
+                
         }
                 
         return 0;
diff --git a/libs/ardour/soundgrid.mm b/libs/ardour/soundgrid.mm
index 31301bf4a2..ac2186e0ed 100644
--- a/libs/ardour/soundgrid.mm
+++ b/libs/ardour/soundgrid.mm
@@ -121,7 +121,8 @@ SoundGrid::initialize (void* window_handle, uint32_t max_tracks, uint32_t max_bu
         mixer_limits.m_clusterConfigs[eClusterType_InputTrack].m_uiIndexNum = max_tracks;
         mixer_limits.m_clusterConfigs[eClusterType_GroupTrack].m_uiIndexNum = max_busses + physical_outputs;
         
-        DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("Initializing SG Core with %1 tracks\n", max_tracks));
+        DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("Initialized SG Core for %1 input racks and %2 group racks\n", 
+                                                       max_tracks, max_busses + physical_outputs));
         
         char execpath[MAXPATHLEN+1];
         uint32_t pathsz = sizeof (execpath);
@@ -240,11 +241,21 @@ SoundGrid::configure_driver (uint32_t inputs, uint32_t outputs, uint32_t tracks)
 
     for (uint32_t n = 0; n < outputs; ++n) {
             uint32_t handle; 
+            const uint32_t channels = 2;
+            const uint32_t pgroup = 7; // these should run last no matter what
 
-            /* process group is set to 7, because these should run last no matter what
-             */
+            if (add_rack (eClusterType_GroupTrack, pgroup, channels, handle)) {
+                    error << string_compose (_("Cannot create mixing channel for driver output %1"), n) << endmsg;
+                    return -1;
+            }
+    }
 
-            if (add_rack (eClusterType_GroupTrack, 0, 1, handle)) {
+    for (uint32_t n = 0; n < outputs; ++n) {
+            uint32_t handle; 
+            const uint32_t channels = 1;
+            const uint32_t pgroup = 2;
+
+            if (add_rack (eClusterType_InputTrack, pgroup, channels, handle)) {
                     error << string_compose (_("Cannot create mixing channel for driver output %1"), n) << endmsg;
                     return -1;
             }
@@ -307,12 +318,24 @@ SoundGrid::configure_driver (uint32_t inputs, uint32_t outputs, uint32_t tracks)
 
             WSAssignmentsCommand outputsCommand;
             Init_WSAddAssignmentsCommand(&outputsCommand, outputs, (WSDControllerHandle)this, 0);
+
+#define INDIRECT_VIA_TRACK
             
             for (uint32_t n = 0; n < outputs; ++n) {
-                    
+
                     ARDOUR::SoundGrid::DriverInputPort src (n);   // writable driver/JACK channel/port
+#ifndef INDIRECT_VIA_TRACK
                     ARDOUR::SoundGrid::PseudoPhysicalOutputPort dst (n);  // physical channel where the signal should go
                     connect (src, dst);
+#else
+                    ARDOUR::SoundGrid::TrackInputPort dst (n, 0);  // physical channel where the signal should go
+                    connect (src, dst);
+
+                    ARDOUR::SoundGrid::TrackOutputPort src2 (n, 0);
+                    ARDOUR::SoundGrid::PseudoPhysicalOutputPortXX dst2 (n);
+                    connect (src2, dst2);
+#endif
+
 #if 0
                     WSAudioAssignment &assignment (outputsCommand.in_Assignments.m_aAssignments[n]);
                     
@@ -862,11 +885,10 @@ SoundGrid::sg_port_as_jack_port (const Port& sgport)
     return jack_port;
 }
 
-#if 0
 void
 SoundGrid::drop_sg_jack_mapping (const string& jack_port)
 {
-        jack_soundgrid_map.remove (jack_port);
+        jack_soundgrid_map.erase (jack_port);
 
         for (SG_JACKMap::iterator i = soundgrid_jack_map.begin(); i != soundgrid_jack_map.end(); ++i) {
                 if (i->second == jack_port) {
@@ -874,7 +896,6 @@ SoundGrid::drop_sg_jack_mapping (const string& jack_port)
                 }
         }
 }
-#endif
 
 int
 SoundGrid::connect (const Port& src, const Port& dst)
@@ -966,9 +987,12 @@ SoundGrid::configure_io (uint32_t cluster_type, uint32_t rack_id, uint32_t chann
     configEvent.controlID.sectionControlID.channelIndex = wvEnum_Unknown;
     configEvent.controlID.sectionControlID.controlID = eControlID_Input_MonoStereo;
 
-    if (set (&configEvent, "I/O configure")) {
+#if 0
+    if (set (&configEvent, string_compose ("I/O configure ctype %1 id %2 to have %3 channels", 
+                                           cluster_type, rack_id, channels))) {
             return -1;
     }
+#endif
     
     return 0;
 }
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 0a90acec46..0bb2fea0cf 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -43,12 +43,6 @@ using Timecode::BBT_Time;
 Meter    TempoMap::_default_meter (4.0, 4.0);
 Tempo    TempoMap::_default_tempo (120.0);
 
-double 
-Tempo::frames_per_beat (framecnt_t sr) const
-{
-	return  (60.0 * sr) / _beats_per_minute;
-}
-
 /***********************************************************************/
 
 double 
@@ -920,7 +914,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 
 			if (!(current < (*next_metric)->start())) {
 
-			  set_metrics:
+		set_metrics:
 				if (((ts = dynamic_cast<TempoSection*> (*next_metric)) != 0)) {
 
 					tempo = ts;
@@ -945,7 +939,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 						double next_beat_frames = tempo->frames_per_beat (_frame_rate);					
 						
 						DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into non-beat-aligned tempo metric at %1 = %2, adjust next beat using %3\n",
-											       tempo->start(), current_frame, tempo->bar_offset()));
+						                                               tempo->start(), current_frame, tempo->bar_offset()));
 						
 						/* back up to previous beat */
 						current_frame -= beat_frames;
@@ -955,7 +949,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 						 * bar start 
 						 */
 						tempo->set_frame (bar_start_frame + 
-								  llrint ((ts->bar_offset() * meter->divisions_per_bar() * beat_frames)));
+						                  llrint ((ts->bar_offset() * meter->divisions_per_bar() * beat_frames)));
 						
 						/* advance to the location of
 						 * the new (adjusted) beat. do
@@ -980,7 +974,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 					} else {
 						
 						DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into beat-aligned tempo metric at %1 = %2\n",
-											       tempo->start(), current_frame));
+						                                               tempo->start(), current_frame));
 						tempo->set_frame (current_frame);
 					}
 
@@ -993,7 +987,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 					 */
 					
 					DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into meter section at %1 vs %2 (%3)\n",
-										       meter->start(), current, current_frame));
+					                                               meter->start(), current, current_frame));
 					
 					assert (current.beats == 1);
 
@@ -1003,13 +997,13 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 				beat_frames = meter->frames_per_grid (*tempo, _frame_rate);
 				
 				DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n", 
-									       beat_frames, meter->divisions_per_bar(), *((Meter*)meter), *((Tempo*)tempo)));
+				                                               beat_frames, meter->divisions_per_bar(), *((Meter*)meter), *((Tempo*)tempo)));
 			
 				++next_metric;
 
 				if (next_metric != metrics.end() && ((*next_metric)->start() == current)) {
 					/* same position so go back and set this one up before advancing
-					*/
+					 */
 					goto set_metrics;
 				}
 
@@ -1029,7 +1023,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 			/* no more metrics - we've timestamped them all, stop here */
 			if (end == max_framepos) {
 				DEBUG_TRACE (DEBUG::TempoMath, string_compose ("stop extending map now that we've reach the end @ %1|%2 = %3\n",
-									       current.bars, current.beats, current_frame));
+				                                               current.bars, current.beats, current_frame));
 				break;
 			}
 		}
@@ -1037,12 +1031,10 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 }
 
 TempoMetric
-TempoMap::metric_at (framepos_t frame) const
+TempoMap::metric_at (framepos_t frame, Metrics::const_iterator* last) const
 {
 	Glib::Threads::RWLock::ReaderLock lm (lock);
 	TempoMetric m (first_meter(), first_tempo());
-	const Meter* meter;
-	const Tempo* tempo;
 
 	/* at this point, we are *guaranteed* to have m.meter and m.tempo pointing
 	   at something, because we insert the default tempo and meter during
@@ -1057,14 +1049,11 @@ TempoMap::metric_at (framepos_t frame) const
 			break;
 		}
 
-		if ((tempo = dynamic_cast<const TempoSection*>(*i)) != 0) {
-			m.set_tempo (*tempo);
-		} else if ((meter = dynamic_cast<const MeterSection*>(*i)) != 0) {
-			m.set_meter (*meter);
-		}
+		m.set_metric(*i);
 
-		m.set_frame ((*i)->frame ());
-		m.set_start ((*i)->start ());
+		if (last) {
+			*last = i;
+		}
 	}
 	
 	return m;
@@ -1075,8 +1064,6 @@ TempoMap::metric_at (BBT_Time bbt) const
 {
 	Glib::Threads::RWLock::ReaderLock lm (lock);
 	TempoMetric m (first_meter(), first_tempo());
-	const Meter* meter;
-	const Tempo* tempo;
 
 	/* at this point, we are *guaranteed* to have m.meter and m.tempo pointing
 	   at something, because we insert the default tempo and meter during
@@ -1093,14 +1080,7 @@ TempoMap::metric_at (BBT_Time bbt) const
 			break;
 		}
 
-		if ((tempo = dynamic_cast<const TempoSection*>(*i)) != 0) {
-			m.set_tempo (*tempo);
-		} else if ((meter = dynamic_cast<const MeterSection*>(*i)) != 0) {
-			m.set_meter (*meter);
-		}
-
-		m.set_frame ((*i)->frame ());
-		m.set_start (section_start);
+		m.set_metric (*i);
 	}
 
 	return m;
@@ -1152,7 +1132,7 @@ TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt, const BBTPointList::const_i
 		bbt.ticks = 0;
 	} else {
 		bbt.ticks = llrint (((frame - (*i).frame) / (*i).tempo->frames_per_beat(_frame_rate)) *
-				    BBT_Time::ticks_per_beat);
+		                    BBT_Time::ticks_per_beat);
 	}
 }
 
@@ -1856,8 +1836,9 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 	   next_tempo  -> first tempo after "pos", possibly metrics.end()
 	*/
 
-	DEBUG_TRACE (DEBUG::TempoMath, string_compose ("frame %1 plus %2 beats, start with tempo = %3 @ %4\n",
-						       pos, beats, *((Tempo*)tempo), tempo->frame()));
+	DEBUG_TRACE (DEBUG::TempoMath,
+	             string_compose ("frame %1 plus %2 beats, start with tempo = %3 @ %4\n",
+	                             pos, beats, *((const Tempo*)tempo), tempo->frame()));
 
 	while (beats) {
 
@@ -1887,7 +1868,7 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 			tempo = dynamic_cast<const TempoSection*>(*next_tempo);
 
 			DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n",
-								       *((Tempo*)tempo), tempo->frame(),
+								       *((const Tempo*)tempo), tempo->frame(),
 								       tempo->frames_per_beat (_frame_rate)));
 
 			while (next_tempo != metrics.end ()) {
@@ -1955,9 +1936,10 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 		}
 	}
 
-	DEBUG_TRACE (DEBUG::TempoMath, string_compose ("frame %1 minus %2 beats, start with tempo = %3 @ %4 prev at beg? %5\n",
-						       pos, beats, *((Tempo*)tempo), tempo->frame(),
-						       prev_tempo == metrics.rend()));
+	DEBUG_TRACE (DEBUG::TempoMath,
+	             string_compose ("frame %1 minus %2 beats, start with tempo = %3 @ %4 prev at beg? %5\n",
+	                             pos, beats, *((const Tempo*)tempo), tempo->frame(),
+	                             prev_tempo == metrics.rend()));
 
 	/* We now have:
 
@@ -1992,9 +1974,10 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 
 			tempo = dynamic_cast<const TempoSection*>(*prev_tempo);
 
-			DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n",
-								       *((Tempo*)tempo), tempo->frame(),
-								       tempo->frames_per_beat (_frame_rate)));
+			DEBUG_TRACE (DEBUG::TempoMath,
+			             string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n",
+			                             *((const Tempo*)tempo), tempo->frame(),
+			                             tempo->frames_per_beat (_frame_rate)));
 
 			while (prev_tempo != metrics.rend ()) {
 
@@ -2184,8 +2167,9 @@ TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const
 
 	assert (tempo);
 
-	DEBUG_TRACE (DEBUG::TempoMath, string_compose ("frame %1 walk by %2 frames, start with tempo = %3 @ %4\n",
-						       pos, distance, *((Tempo*)tempo), tempo->frame()));
+	DEBUG_TRACE (DEBUG::TempoMath,
+	             string_compose ("frame %1 walk by %2 frames, start with tempo = %3 @ %4\n",
+	                             pos, distance, *((const Tempo*)tempo), tempo->frame()));
 	
 	Evoral::MusicalTime beats = 0;
 
@@ -2226,9 +2210,10 @@ TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const
 
 			tempo = dynamic_cast<const TempoSection*>(*next_tempo);
 
-			DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n",
-								       *((Tempo*)tempo), tempo->frame(),
-								       tempo->frames_per_beat (_frame_rate)));
+			DEBUG_TRACE (DEBUG::TempoMath,
+			             string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n",
+			                             *((const Tempo*)tempo), tempo->frame(),
+			                             tempo->frames_per_beat (_frame_rate)));
 
 			while (next_tempo != metrics.end ()) {
 
@@ -2335,9 +2320,9 @@ operator<< (std::ostream& o, const MetricSection& section) {
 	const MeterSection* ms;
 
 	if ((ts = dynamic_cast<const TempoSection*> (&section)) != 0) {
-		o << *((Tempo*) ts);
+		o << *((const Tempo*) ts);
 	} else if ((ms = dynamic_cast<const MeterSection*> (&section)) != 0) {
-		o << *((Meter*) ms);
+		o << *((const Meter*) ms);
 	}
 
 	return o;
diff --git a/libs/ardour/test/mtdm_test.cc b/libs/ardour/test/mtdm_test.cc
index e409bd664a..134ebea8da 100644
--- a/libs/ardour/test/mtdm_test.cc
+++ b/libs/ardour/test/mtdm_test.cc
@@ -14,7 +14,7 @@ MTDMTest::basicTest ()
 	float out[256];
 
 	memset (in, 0, 256 * sizeof (float));
-	MTDM* mtdm = new MTDM;
+	MTDM* mtdm = new MTDM (44100);
 	mtdm->process (256, in, out);
 	memcpy (in, out, 256 * sizeof (float));
 	
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 9524ca7708..fdceda8516 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -285,7 +285,7 @@ def configure(conf):
     autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL',
                       atleast_version='7.0.0')
     autowaf.check_pkg(conf, 'ltc', uselib_store='LTC',
-                      atleast_version='1.0.3', mandatory=False)
+                      atleast_version='1.1.0', mandatory=False)
 
     # we don't try to detect this, since its part of our source tree
 
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp
index ffddd9d6e5..845a3b85d5 100644
--- a/libs/evoral/evoral/ControlList.hpp
+++ b/libs/evoral/evoral/ControlList.hpp
@@ -86,6 +86,7 @@ public:
 	typedef EventList::iterator iterator;
 	typedef EventList::reverse_iterator reverse_iterator;
 	typedef EventList::const_iterator const_iterator;
+	typedef EventList::const_reverse_iterator const_reverse_iterator;
 
 	ControlList (const Parameter& id);
 	ControlList (const ControlList&);
@@ -157,6 +158,10 @@ public:
 	const_iterator      begin() const { return _events.begin(); }
 	iterator            end()         { return _events.end(); }
 	const_iterator      end()   const { return _events.end(); }
+	reverse_iterator            rbegin()       { return _events.rbegin(); }
+	const_reverse_iterator      rbegin() const { return _events.rbegin(); }
+	reverse_iterator            rend()         { return _events.rend(); }
+	const_reverse_iterator      rend()   const { return _events.rend(); }
 	ControlEvent*       back()        { return _events.back(); }
 	const ControlEvent* back()  const { return _events.back(); }
 	ControlEvent*       front()       { return _events.front(); }
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index d2ef1fe246..7db4e74650 100644
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -390,7 +390,6 @@ ControlList::add (double when, double value)
 
 	DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 add %2 at %3 w/erase = %4 at end ? %5\n", 
 							 this, value, when, _in_write_pass, (most_recent_insert_iterator == _events.end())));
-
 	{
 		Glib::Threads::Mutex::Lock lm (_lock);
 		ControlEvent cp (when, 0.0f);
@@ -416,7 +415,7 @@ ControlList::add (double when, double value)
 			 * write pass.
 			 *
 			 * We need to add a new point at insert_position
-			 * corresponding the value there. 
+			 * corresponding to the (existing, implicit) value there. 
 			 */
 
 			/* the insert_iterator is not set, figure out where
@@ -475,84 +474,52 @@ ControlList::add (double when, double value)
 			did_write_during_pass = true;
 
 		} else if (most_recent_insert_iterator == _events.end() || when > (*most_recent_insert_iterator)->when) {
-
-			/* this is NOT the first point to be added after the
-			   start of a write pass, and we have a bit of work to
-			   do figuring out where to add the new point, as well
-			   as potentially erasing existing data between the
-			   most recently added point and wherever this one
-			   will end up.
-			*/
-				
-			DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 need to discover insert iterator (@end ? %2)\n", 
-									 this, (most_recent_insert_iterator == _events.end())));
-
-			/* this means that we either *know* we want to insert
-			 * at the end, or that we don't know where to insert.
-			 * 
-			 * so ... lets perform some quick checks before we
-			 * go doing binary search to figure out where to
-			 * insert.
-			 */
-
-			if (_events.back()->when == when) {
-
-				/* we need to modify the final point, so 
-				   make most_recent_insert_iterator point to it.
-				*/
-
-				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 modify final value\n", this));
-				
-				most_recent_insert_iterator = _events.end();
-				--most_recent_insert_iterator;
-
-			} else if (_events.back()->when < when) {
-
-				/* the new point is beyond the end of the
-				 * current list
-				 */
-
-				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 plan to append to list\n", this));
-
-				if (_in_write_pass) {
-					/* remove the final point, because
-					   we're adding one beyond it.
-					*/
-					delete _events.back();
-					_events.pop_back();
+			
+			DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 %2 erase from existing iterator (@end ? %3)\n", 
+									 this, (_in_write_pass  ? "DO" : "DON'T"),
+									 (most_recent_insert_iterator == _events.end())));
+			
+			if (_in_write_pass) {
+				while (most_recent_insert_iterator != _events.end()) {
+					if ((*most_recent_insert_iterator)->when < when) {
+						if (_in_write_pass) {
+							DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 erase existing @ %2\n", this, (*most_recent_insert_iterator)));
+							delete *most_recent_insert_iterator;
+							most_recent_insert_iterator = _events.erase (most_recent_insert_iterator);
+							continue;
+						}
+					} else if ((*most_recent_insert_iterator)->when >= when) {
+						break;
+					}
+					++most_recent_insert_iterator;
 				}
-				
-				/* leaving this here will force an append */
 
-				most_recent_insert_iterator = _events.end();
+				if (most_recent_insert_iterator != _events.end()) {
+					if ((*most_recent_insert_iterator)->when - when > 64) {
+						/* next control point is some
+						 * distance from where our new
+						 * point is going to go - add a
+						 * new point to avoid changing
+						 * the shape of the line too
+						 * much. the insert iterator needs
+						 * to point to the new control
+						 * point so that our insert
+						 * will happen correctly.
+						 */
+						most_recent_insert_iterator = _events.insert (most_recent_insert_iterator, 
+											      new ControlEvent (when+1, (*most_recent_insert_iterator)->value));
+						DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 added post-erase guard point @ %2 = %3\n",
+												 this, when+1,
+												 (*most_recent_insert_iterator)->value));
+					}
+				}	 
 
 			} else {
-
-				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 erase %2 from existing iterator (@end ? %3\n", 
-										 this, _in_write_pass,
-										 (most_recent_insert_iterator == _events.end())));
-
-				if (_in_write_pass) {
-					while (most_recent_insert_iterator != _events.end()) {
-						if ((*most_recent_insert_iterator)->when < when) {
-							if (_in_write_pass) {
-								DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 erase existing @ %2\n", this, (*most_recent_insert_iterator)));
-								delete *most_recent_insert_iterator;
-								most_recent_insert_iterator = _events.erase (most_recent_insert_iterator);
-								continue;
-							}
-						} else if ((*most_recent_insert_iterator)->when >= when) {
-							break;
-						}
-						++most_recent_insert_iterator;
-					}
-				} else {
-					
-					/* not in a write pass: figure out the iterator we should insert in front of */
-
-					ControlEvent cp (when, 0.0f);
-					most_recent_insert_iterator = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
-				}
+				
+				/* not in a write pass: figure out the iterator we should insert in front of */
+				
+				ControlEvent cp (when, 0.0f);
+				most_recent_insert_iterator = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
 			}
 		} 
 		
@@ -581,6 +548,7 @@ ControlList::add (double when, double value)
 							 */
 							_events.back()->when = when;
 							done = true;
+							DEBUG_TRACE (DEBUG::ControlList, string_compose ("final value of %1 moved to %2\n", value, when));
 						}
 					}
 				}
@@ -588,6 +556,7 @@ ControlList::add (double when, double value)
 
 			if (!done) {
 				_events.push_back (new ControlEvent (when, value));
+				DEBUG_TRACE (DEBUG::ControlList, string_compose ("\tactually appended, size now %1\n", _events.size()));
 			}
 
 			if (!_in_write_pass) {
@@ -596,13 +565,28 @@ ControlList::add (double when, double value)
 			}
 
 		} else if ((*most_recent_insert_iterator)->when == when) {
-			DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 reset existing point to new value %2\n", this, value));
 
-			/* only one point allowed per time point, so just
-			 * reset the value here.
-			 */
+			if ((*most_recent_insert_iterator)->value != value) {
+				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 reset existing point to new value %2\n", this, value));
 
-			(*most_recent_insert_iterator)->value = value;
+				/* only one point allowed per time point, so just
+				 * reset the value here.
+				 */
+				
+				(*most_recent_insert_iterator)->value = value;
+
+				/* if we modified the final value, then its as
+				 * if we inserted a new point as far as the
+				 * next addition, so make sure we know that.
+				 */
+
+				if (_in_write_pass && _events.back()->when == when) {
+					most_recent_insert_iterator = _events.end();
+				}
+
+			} else {
+				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 same time %2, same value value %3\n", this, when, value));
+			}
 
 		} else {
 			DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert new point at %2 at iterator at %3\n", this, when, (*most_recent_insert_iterator)->when));
@@ -630,14 +614,36 @@ ControlList::add (double when, double value)
 								most_recent_insert_iterator = b;
 							}
 
+							DEBUG_TRACE (DEBUG::ControlList, string_compose ("final value of %1 moved to %2\n", value, when));
 							done = true;
 						}
 					}
 				}
 			}
-			
+
+			if (most_recent_insert_iterator != _events.end()) {
+				if ((*most_recent_insert_iterator)->when - when > 64) {
+					/* next control point is some
+					 * distance from where our new
+					 * point is going to go - add a
+					 * new point to avoid changing
+					 * the shape of the line too
+					 * much. the insert iterator needs
+					 * to point to the new control
+					 * point so that our insert
+					 * will happen correctly.
+					 */
+					most_recent_insert_iterator = _events.insert (most_recent_insert_iterator, 
+										      new ControlEvent (when+1, (*most_recent_insert_iterator)->value));
+					DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 added insert-post-erase guard point @ %2 = %3\n",
+											 this, when+1,
+											 (*most_recent_insert_iterator)->value));
+				}
+			}	 
+
 			if (!done) {
 				EventList::iterator x = _events.insert (most_recent_insert_iterator, new ControlEvent (when, value));
+				DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 inserted new value before MRI, size now %2\n", this, _events.size()));
 
 				if (!_in_write_pass) {
 					most_recent_insert_iterator = x;
diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index 3f2ee361d3..3f32340e4d 100644
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -195,25 +195,47 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
 	int32_t original_veclen;
 	int32_t npoints;
 
+	if (veclen == 0) {
+		return;
+	}
+
 	if ((npoints = _list.events().size()) == 0) {
-		for (i = 0; i < veclen; ++i) {
+		/* no events in list, so just fill the entire array with the default value */
+		for (int32_t i = 0; i < veclen; ++i) {
 			vec[i] = _list.default_value();
 		}
 		return;
 	}
 
+	if (npoints == 1) {
+		for (int32_t i = 0; i < veclen; ++i) {
+			vec[i] = _list.events().front()->value;
+		}
+		return;
+	}
+
 	/* events is now known not to be empty */
 
 	max_x = _list.events().back()->when;
 	min_x = _list.events().front()->when;
 
-	lx = max (min_x, x0);
-
-	if (x1 < 0) {
-		x1 = _list.events().back()->when;
+	if (x0 > max_x) {
+		/* totally past the end - just fill the entire array with the final value */	
+		for (int32_t i = 0; i < veclen; ++i) {
+			vec[i] = _list.events().back()->value;
+		}
+		return;
 	}
 
-	hx = min (max_x, x1);
+	if (x1 < min_x) {
+		/* totally before the first event - fill the entire array with
+		 * the initial value.
+		 */
+		for (int32_t i = 0; i < veclen; ++i) {
+			vec[i] = _list.events().front()->value;
+		}
+		return;
+	}
 
 	original_veclen = veclen;
 
@@ -224,16 +246,16 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
 		*/
 
 		double frac = (min_x - x0) / (x1 - x0);
-		int32_t subveclen = (int32_t) floor (veclen * frac);
+		int64_t fill_len = (int64_t) floor (veclen * frac);
 
-		subveclen = min (subveclen, veclen);
-
-		for (i = 0; i < subveclen; ++i) {
+		fill_len = min (fill_len, (int64_t)veclen);
+		
+		for (i = 0; i < fill_len; ++i) {
 			vec[i] = _list.events().front()->value;
 		}
 
-		veclen -= subveclen;
-		vec += subveclen;
+		veclen -= fill_len;
+		vec += fill_len;
 	}
 
 	if (veclen && x1 > max_x) {
@@ -241,36 +263,21 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
 		/* fill some end section of the array with the default or final value */
 
 		double frac = (x1 - max_x) / (x1 - x0);
-
-		int32_t subveclen = (int32_t) floor (original_veclen * frac);
-
+		int64_t fill_len = (int64_t) floor (original_veclen * frac);
 		float val;
 
-		subveclen = min (subveclen, veclen);
-
+		fill_len = min (fill_len, (int64_t)veclen);
 		val = _list.events().back()->value;
 
-		i = veclen - subveclen;
-
-		for (i = veclen - subveclen; i < veclen; ++i) {
+		for (i = veclen - fill_len; i < veclen; ++i) {
 			vec[i] = val;
 		}
 
-		veclen -= subveclen;
-	}
-
-	if (veclen == 0) {
-		return;
-	}
-
-	if (npoints == 1) {
-
-		for (i = 0; i < veclen; ++i) {
-			vec[i] = _list.events().front()->value;
-		}
-		return;
+		veclen -= fill_len;
 	}
 
+	lx = max (min_x, x0);
+	hx = min (max_x, x1);
 
 	if (npoints == 2) {
 
diff --git a/libs/gtkmm2ext/cairo_packer.cc b/libs/gtkmm2ext/cairo_packer.cc
index 6145f7dd50..822f943939 100644
--- a/libs/gtkmm2ext/cairo_packer.cc
+++ b/libs/gtkmm2ext/cairo_packer.cc
@@ -13,7 +13,10 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*)
 		
 		Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context();
 		w.translate_coordinates (*window_parent, 0, 0, x, y);
-		context->set_source_rgba (0.149, 0.149, 0.149, 1.0);
+
+		Gdk::Color bg = get_bg ();
+
+		context->set_source_rgba (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p(), 1.0);
 		Gtkmm2ext::rounded_rectangle (context, x, y, w.get_allocation().get_width(), w.get_allocation().get_height(), 9);
 		context->fill ();
 	}
@@ -21,13 +24,19 @@ CairoPacker::draw_background (Gtk::Widget& w, GdkEventExpose*)
 
 CairoHPacker::CairoHPacker ()
 {
-	Gdk::Color bg;
+}
 
-	bg.set_red (lrint (0.149 * 65535));
-	bg.set_green (lrint (0.149 * 65535));
-	bg.set_blue (lrint (0.149 * 65535));
+void
+CairoHPacker::on_realize ()
+{
+	HBox::on_realize ();
+	CairoWidget::provide_background_for_cairo_widget (*this, get_bg ());
+}
 
-	CairoWidget::provide_background_for_cairo_widget (*this, bg);
+Gdk::Color
+CairoHPacker::get_bg () const
+{
+	return get_style()->get_bg (Gtk::STATE_NORMAL);
 }
 
 bool
@@ -39,13 +48,6 @@ CairoHPacker::on_expose_event (GdkEventExpose* ev)
 
 CairoVPacker::CairoVPacker ()
 {
-	Gdk::Color bg;
-
-	bg.set_red (lrint (0.149 * 65535));
-	bg.set_green (lrint (0.149 * 65535));
-	bg.set_blue (lrint (0.149 * 65535));
-
-	CairoWidget::provide_background_for_cairo_widget (*this, bg);
 }
 
 bool
@@ -54,3 +56,16 @@ CairoVPacker::on_expose_event (GdkEventExpose* ev)
 	draw_background (*this, ev);
 	return VBox::on_expose_event (ev);
 }
+
+void
+CairoVPacker::on_realize ()
+{
+	VBox::on_realize ();
+	CairoWidget::provide_background_for_cairo_widget (*this, get_bg());
+}
+
+Gdk::Color
+CairoVPacker::get_bg () const
+{
+	return get_style()->get_bg (Gtk::STATE_NORMAL);
+}
diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h b/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h
index f6d7753570..f38fe80eb5 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cairo_packer.h
@@ -9,6 +9,8 @@ class CairoPacker
 	CairoPacker () {}
 	virtual ~CairoPacker () {}
 
+        virtual Gdk::Color get_bg () const = 0;
+
   protected:
 	virtual void draw_background (Gtk::Widget&, GdkEventExpose*);
 };
@@ -19,7 +21,10 @@ class CairoHPacker : public CairoPacker, public Gtk::HBox
 	CairoHPacker ();
 	~CairoHPacker() {}
 
+        Gdk::Color get_bg () const;
+
 	bool on_expose_event (GdkEventExpose*);
+        void on_realize ();
 };
 
 class CairoVPacker : public CairoPacker, public Gtk::VBox
@@ -28,7 +33,10 @@ class CairoVPacker : public CairoPacker, public Gtk::VBox
 	CairoVPacker ();
 	~CairoVPacker () {}
 
+        Gdk::Color get_bg () const;
+
 	bool on_expose_event (GdkEventExpose*);
+        void on_realize ();
 };
 
 #endif /* __gtkmm2ext_cairo_packer_h__ */
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index c4c9a4125c..1b0a9f5725 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -110,6 +110,8 @@ namespace Gtkmm2ext {
 	Gtk::Label* left_aligned_label (std::string const &);
 
 	void set_no_tooltip_whatsoever (Gtk::Widget &);
+	void enable_tooltips ();
+	void disable_tooltips ();
 };
 
 #endif /*  __gtkmm2ext_utils_h__ */
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 11c5b90722..c0c7a88362 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -650,3 +650,15 @@ Gtkmm2ext::set_no_tooltip_whatsoever (Gtk::Widget& w)
 	w.property_has_tooltip() = true;
 	w.signal_query_tooltip().connect (sigc::ptr_fun (make_null_tooltip));
 }
+
+void
+Gtkmm2ext::enable_tooltips ()
+{
+	gtk_rc_parse_string ("gtk-enable-tooltips = 1");
+}
+
+void
+Gtkmm2ext::disable_tooltips ()
+{
+	gtk_rc_parse_string ("gtk-enable-tooltips = 0");
+}
diff --git a/libs/midi++2/jack_midi_port.cc b/libs/midi++2/jack_midi_port.cc
index 10274ad859..ff26a84e4b 100644
--- a/libs/midi++2/jack_midi_port.cc
+++ b/libs/midi++2/jack_midi_port.cc
@@ -214,6 +214,13 @@ JackMIDIPort::write (const byte * msg, size_t msglen, timestamp_t timestamp)
 {
 	int ret = 0;
 
+	if (!_jack_client || !_jack_port) {
+		/* poof ! make it just vanish into thin air, since we are no
+		   longer connected to JACK.
+		*/
+		return msglen;
+	}
+
 	if (!sends_output()) {
 		return ret;
 	}
diff --git a/libs/timecode/src/time.cc b/libs/timecode/src/time.cc
index 4609fbea87..a0d56c7264 100644
--- a/libs/timecode/src/time.cc
+++ b/libs/timecode/src/time.cc
@@ -21,6 +21,7 @@
 
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "timecode/time.h"
 
@@ -623,6 +624,24 @@ std::string timecode_format_sampletime (
 	return timecode_format_time(t);
 }
 
+bool parse_timecode_format(std::string tc, Timecode::Time &TC) {
+	char negative[2];
+	char ignored[2];
+	TC.subframes = 0;
+	if (sscanf (tc.c_str(), "%[- ]%" PRId32 ":%" PRId32 ":%" PRId32 "%[:;]%" PRId32,
+				negative, &TC.hours, &TC.minutes, &TC.seconds, ignored, &TC.frames) != 6) {
+		TC.hours = TC.minutes = TC.seconds = TC.frames = 0;
+		TC.negative = false;
+		return false;
+	}
+	if (negative[0]=='-') {
+		TC.negative = true;
+	} else {
+		TC.negative = false;
+	}
+	return true;
+}
+
 void
 timecode_to_sample(
 		Timecode::Time& timecode, int64_t& sample,
@@ -675,16 +694,20 @@ timecode_to_sample(
 		//  0:10:00:00        0.0             0                   600.000         26460000 (accurate)
 		//
 		//  Per Sigmond <per@sigmond.no>
+		//
+		//  This schma would compensate exactly for a frame-rate of 30 * 0.999. but the
+		//  actual rate is 30000/1001 - which results in an offset of -3.6ms per hour or
+		//  about -86ms over a 24-hour period. (SMPTE 12M-1999)
+		//
+		//  Robin Gareus <robin@gareus.org>
 
-		// Samples inside time dividable by 10 minutes (real time accurate)
-		int64_t base_samples = (int64_t) (((timecode.hours * 107892) + ((timecode.minutes / 10) * 17982)) * frames_per_timecode_frame);
-
-		// Samples inside time exceeding the nearest 10 minutes (always offset, see above)
-		int32_t exceeding_df_minutes = timecode.minutes % 10;
-		int32_t exceeding_df_seconds = (exceeding_df_minutes * 60) + timecode.seconds;
-		int32_t exceeding_df_frames = (30 * exceeding_df_seconds) + timecode.frames - (2 * exceeding_df_minutes);
-		int64_t exceeding_samples = (int64_t) rint(exceeding_df_frames * frames_per_timecode_frame);
-		sample = base_samples + exceeding_samples;
+		const int64_t fps_i = ceil(timecode.rate);
+		int64_t totalMinutes = 60 * timecode.hours + timecode.minutes;
+		int64_t frameNumber  = fps_i * 3600 * timecode.hours
+			+ fps_i * 60 * timecode.minutes
+			+ fps_i * timecode.seconds + timecode.frames
+			- 2 * (totalMinutes - totalMinutes / 10);
+		sample = frameNumber * sample_frame_rate / (double) timecode.rate;
 	} else {
 		/*
 		   Non drop is easy.. just note the use of
@@ -697,7 +720,7 @@ timecode_to_sample(
 	}
 
 	if (use_subframes) {
-		sample += (int64_t) (((double)timecode.subframes * frames_per_timecode_frame) / subframes_per_frame);
+		sample += (int64_t) rint(((double)timecode.subframes * frames_per_timecode_frame) / (double)subframes_per_frame);
 	}
 
 	if (use_offset) {
@@ -736,21 +759,11 @@ sample_to_timecode (
 		bool offset_is_negative, int64_t offset_samples
 		)
 {
-	const double frames_per_timecode_frame = (double) sample_frame_rate / (double) timecode_frames_per_second;
-	int32_t frames_per_hour;
-
-	if (timecode_drop_frames) {
-	  frames_per_hour = (int32_t)(107892 * frames_per_timecode_frame);
-	} else {
-	  frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second) * frames_per_timecode_frame);
-	}
-
-  /* do the work */
 	int64_t offset_sample;
 
 	if (!use_offset) {
-		offset_sample = sample;
-		timecode.negative = false;
+		timecode.negative = (sample < 0);
+		offset_sample = llabs(sample);
 	} else {
 		if (offset_is_negative) {
 			offset_sample = sample + offset_samples;
@@ -766,66 +779,50 @@ sample_to_timecode (
 		}
 	}
 
-	double timecode_frames_left_exact;
-	double timecode_frames_fraction;
-	uint64_t timecode_frames_left;
-
-	// Extract whole hours. Do this to prevent rounding errors with
-	// high sample numbers in the calculations that follow.
-	timecode.hours = offset_sample / frames_per_hour;
-	offset_sample = offset_sample % frames_per_hour;
-
-	// Calculate exact number of (exceeding) timecode frames and fractional frames
-	timecode_frames_left_exact = (double) offset_sample / frames_per_timecode_frame;
-	timecode_frames_fraction = timecode_frames_left_exact - floor( timecode_frames_left_exact );
-	timecode.subframes = (int32_t) floor(timecode_frames_fraction * subframes_per_frame);
-
-	// XXX Not sure if this is necessary anymore...
-	if (timecode.subframes == subframes_per_frame) {
-		// This can happen with 24 fps (and 29.97 fps ?)
-		timecode_frames_left_exact = ceil( timecode_frames_left_exact );
-		timecode.subframes = 0;
-	}
-
-	// Extract hour-exceeding frames for minute, second and frame calculations
-	timecode_frames_left = (uint64_t) floor (timecode_frames_left_exact);
-
 	if (timecode_drop_frames) {
-		// See int32_t explanation in timecode_to_sample()...
+		int64_t frameNumber = floor( (double)offset_sample * timecode_frames_per_second / sample_frame_rate);
 
-		// Number of 10 minute chunks
-		timecode.minutes = (timecode_frames_left / 17982) * 10; // exactly 17982 frames in 10 minutes
-		// frames exceeding the nearest 10 minute barrier
-		int32_t exceeding_df_frames = timecode_frames_left % 17982;
+		/* there are 17982 frames in 10 min @ 29.97df */
+		const int64_t D = frameNumber / 17982;
+		const int64_t M = frameNumber % 17982;
 
-		// Find minutes exceeding the nearest 10 minute barrier
-		if (exceeding_df_frames >= 1800) { // nothing to do if we are inside the first minute (0-1799)
-			exceeding_df_frames -= 1800; // take away first minute (different number of frames than the others)
-			int32_t extra_minutes_minus_1 = exceeding_df_frames / 1798; // how many minutes after the first one
-			exceeding_df_frames -= extra_minutes_minus_1 * 1798; // take away the (extra) minutes just found
-			timecode.minutes += extra_minutes_minus_1 + 1; // update with exceeding minutes
+		timecode.subframes = rint(subframes_per_frame
+				* ((double)offset_sample * timecode_frames_per_second / sample_frame_rate - (double)frameNumber));
+
+		if (timecode.subframes == subframes_per_frame) {
+			timecode.subframes = 0;
+			frameNumber++;
 		}
 
-		// Adjust frame numbering for dropped frames (frame 0 and 1 skipped at start of every minute except every 10th)
-		if (timecode.minutes % 10) {
-			// Every minute except every 10th
-			if (exceeding_df_frames < 28) {
-				// First second, frames 0 and 1 are skipped
-				timecode.seconds = 0;
-				timecode.frames = exceeding_df_frames + 2;
-			} else {
-				// All other seconds, all 30 frames are counted
-				exceeding_df_frames -= 28;
-				timecode.seconds = (exceeding_df_frames / 30) + 1;
-				timecode.frames = exceeding_df_frames % 30;
-			}
-		} else {
-			// Every 10th minute, all 30 frames counted in all seconds
-			timecode.seconds = exceeding_df_frames / 30;
-			timecode.frames = exceeding_df_frames % 30;
-		}
+		frameNumber +=  18*D + 2*((M - 2) / 1798);
+
+		timecode.frames  =    frameNumber % 30;
+		timecode.seconds =   (frameNumber / 30) % 60;
+		timecode.minutes =  ((frameNumber / 30) / 60) % 60;
+		timecode.hours   = (((frameNumber / 30) / 60) / 60);
+
 	} else {
-		// Non drop is easy
+		double timecode_frames_left_exact;
+		double timecode_frames_fraction;
+		int64_t timecode_frames_left;
+		const double frames_per_timecode_frame = sample_frame_rate / timecode_frames_per_second;
+		const int64_t frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second) * frames_per_timecode_frame);
+
+		timecode.hours = offset_sample / frames_per_hour;
+
+		// Extract whole hours. Do this to prevent rounding errors with
+		// high sample numbers in the calculations that follow.
+		timecode_frames_left_exact = (double)(offset_sample % frames_per_hour) / frames_per_timecode_frame;
+		timecode_frames_fraction = timecode_frames_left_exact - floor( timecode_frames_left_exact );
+
+		timecode.subframes = (int32_t) rint(timecode_frames_fraction * subframes_per_frame);
+		timecode_frames_left = (int64_t) floor (timecode_frames_left_exact);
+
+		if (timecode.subframes == subframes_per_frame) {
+			timecode_frames_left++;
+			timecode.subframes = 0;
+		}
+
 		timecode.minutes = timecode_frames_left / ((int32_t) rint (timecode_frames_per_second) * 60);
 		timecode_frames_left = timecode_frames_left % ((int32_t) rint (timecode_frames_per_second) * 60);
 		timecode.seconds = timecode_frames_left / (int32_t) rint(timecode_frames_per_second);
diff --git a/libs/timecode/timecode/time.h b/libs/timecode/timecode/time.h
index 23655bfe5d..dcd537c7e5 100644
--- a/libs/timecode/timecode/time.h
+++ b/libs/timecode/timecode/time.h
@@ -112,6 +112,8 @@ std::string timecode_format_sampletime (
 		double timecode_frames_per_second, bool timecode_drop_frames
 		);
 
+bool parse_timecode_format(std::string tc, Timecode::Time &TC);
+
 void
 timecode_to_sample(
 		Timecode::Time& timecode, int64_t& sample,
diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index c6b71e4e37..246e451aa6 100755
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -29,7 +29,7 @@ GetOptions ("platform=s" => \$platform,
 	    "accelmap" => \$make_accelmap,
 	    "merge=s" => \$merge_from);
 
-if ($platform eq "darwin") {
+if ($platform eq "osx") {
 
     $gtk_modifier_map{'PRIMARY'} = 'Primary';
     $gtk_modifier_map{'SECONDARY'} = 'Control';
@@ -37,7 +37,7 @@ if ($platform eq "darwin") {
     $gtk_modifier_map{'LEVEL4'} = 'Mod1';
     $gtk_modifier_map{'WINDOW'} = 'Control';
 
-    $cs_modifier_map{'PRIMARY'} = 'Command';
+    $cs_modifier_map{'PRIMARY'} = 'Cmd';
     $cs_modifier_map{'SECONDARY'} = 'Control';
     $cs_modifier_map{'TERTIARY'} = 'Shift';
     $cs_modifier_map{'LEVEL4'} = 'Mod1';
@@ -101,6 +101,8 @@ if ($platform eq "darwin") {
     'Page_Up' => 'Page Up',
     'space' => 'space',
     'KP_' => 'KP$\_$',
+    'greater' => '>',
+    'less' => '<',
     );
 
 if ($merge_from) {
diff --git a/wscript b/wscript
index 3ff944dfc4..c26902bf6c 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 # Variables for 'waf dist'
-VERSION = '3.0beta5'
+VERSION = '3.0rc1'
 APPNAME = 'Ardour3'
 
 # Mandatory variables
@@ -163,6 +163,14 @@ def set_compiler_flags (conf,opt):
     else:
         conf.env['build_target'] = opt.dist_target
 
+    if conf.env['build_target'] == 'snowleopard':
+        #
+        # stupid OS X 10.6 has a bug in math.h that prevents llrint and friends
+        # from being visible.
+        # 
+        debug_flags.append ('-U__STRICT_ANSI__')
+        optimization_flags.append ('-U__STRICT_ANSI__')
+
     if cpu == 'powerpc' and conf.env['build_target'] != 'none':
         #
         # Apple/PowerPC optimization options