diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 0cdf195798..663c153c4f 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -48,8 +48,8 @@
     <Option name="marker drag line" value="004f00f9"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="marker track" value="ddddd8ff"/>
-    <Option name="measure line bar" value="d7d9d99c"/>
-    <Option name="measure line beat" value="b5b5b576"/>
+    <Option name="measure line bar" value="ffffff9c"/>
+    <Option name="measure line beat" value="a29e9e76"/>
     <Option name="meter bar" value="626470ff"/>
     <Option name="meter fill min" value="0000ffff"/>
     <Option name="meter fill clip" value="ff0000ff"/>
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index 5d1f89dba8..907ef38f5d 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -298,7 +298,7 @@ style "treeview_display" = "small_bold_text"
 	base[SELECTED] = { 0, 0.75, 0.75 }
 
 	# row text when in normal state and not a parent
-	text[NORMAL] = { 0.80, 0.80, 0.80 }
+	text[NORMAL] = { 0.20, 0.20, 0.20 }
 
 	# selected row text with window focus
 	text[SELECTED] = { 1.0, 1.0, 1.0 }  
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 6e837b1626..c3fc279991 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -83,9 +83,9 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 	, end_xfade_out (0)
 	, end_xfade_rect (0)
 	, _amplitude_above_axis(1.0)
-	, _flags(0)
 	, fade_color(0)
 {
+	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
 
 AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
@@ -104,9 +104,9 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 	, end_xfade_out (0)
 	, end_xfade_rect (0)
 	, _amplitude_above_axis(1.0)
-	, _flags(0)
 	, fade_color(0)
 {
+	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
 
 AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr<AudioRegion> other_region)
@@ -123,7 +123,6 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt
 	, end_xfade_out (0)
 	, end_xfade_rect (0)
 	, _amplitude_above_axis (other._amplitude_above_axis)
-	, _flags (other._flags)
 	, fade_color(0)
 {
 	Gdk::Color c;
@@ -133,6 +132,8 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt
 	c.set_rgb_p (r/255.0, g/255.0, b/255.0);
 
 	init (c, true);
+
+	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
 
 void
@@ -143,17 +144,7 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
 	RegionView::init (basic_color, wfd);
 
-	XMLNode *node;
-
 	_amplitude_above_axis = 1.0;
-	_flags                = 0;
-
-	if ((node = _region->extra_xml ("GUI")) != 0) {
-		set_flags (node);
-	} else {
-		_flags = WaveformVisible;
-		store_flags ();
-	}
 
 	compute_colors (basic_color);
 
@@ -230,6 +221,10 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
 	set_colors ();
 
+	setup_waveform_visibility ();
+	setup_waveform_shape ();
+	setup_waveform_scale ();
+
 	/* XXX sync mark drag? */
 }
 
@@ -765,8 +760,8 @@ AudioRegionView::set_samples_per_unit (gdouble spu)
 {
 	RegionView::set_samples_per_unit (spu);
 
-	if (_flags & WaveformVisible) {
-		for (uint32_t n=0; n < waves.size(); ++n) {
+	if (Config->get_show_waveforms ()) {
+		for (uint32_t n = 0; n < waves.size(); ++n) {
 			waves[n]->property_samples_per_unit() = spu;
 		}
 	}
@@ -818,25 +813,20 @@ AudioRegionView::set_colors ()
 }
 
 void
-AudioRegionView::set_waveform_visible (bool yn)
+AudioRegionView::setup_waveform_visibility ()
 {
-	if (((_flags & WaveformVisible) != yn)) {
-		if (yn) {
-			for (uint32_t n=0; n < waves.size(); ++n) {
-				/* make sure the zoom level is correct, since we don't update
-				   this when waveforms are hidden.
-				*/
-				waves[n]->property_samples_per_unit() = samples_per_unit;
-				waves[n]->show();
-			}
-			_flags |= WaveformVisible;
-		} else {
-			for (uint32_t n=0; n < waves.size(); ++n) {
-				waves[n]->hide();
-			}
-			_flags &= ~WaveformVisible;
+	if (Config->get_show_waveforms ()) {
+		for (uint32_t n = 0; n < waves.size(); ++n) {
+			/* make sure the zoom level is correct, since we don't update
+			   this when waveforms are hidden.
+			*/
+			waves[n]->property_samples_per_unit() = samples_per_unit;
+			waves[n]->show();
+		}
+	} else {
+		for (uint32_t n = 0; n < waves.size(); ++n) {
+			waves[n]->hide();
 		}
-		store_flags ();
 	}
 }
 
@@ -971,10 +961,10 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
 	wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
 	wave->property_zero_line() = true;
 	wave->property_region_start() = _region->start();
-	wave->property_rectified() = (bool) (_flags & WaveformRectified);
-	wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
+	wave->property_rectified() = Config->get_waveform_shape() == Rectified;
+	wave->property_logscaled() = Config->get_waveform_scale() == Logarithmic;
 
-	if (!(_flags & WaveformVisible)) {
+	if (!Config->get_show_waveforms ()) {
 		wave->hide();
 	}
 
@@ -1079,90 +1069,18 @@ AudioRegionView::remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent */*
 }
 
 void
-AudioRegionView::store_flags()
+AudioRegionView::setup_waveform_shape ()
 {
-	XMLNode *node = new XMLNode ("GUI");
-
-	node->add_property ("waveform-visible", (_flags & WaveformVisible) ? "yes" : "no");
-	node->add_property ("waveform-rectified", (_flags & WaveformRectified) ? "yes" : "no");
-	node->add_property ("waveform-logscaled", (_flags & WaveformLogScaled) ? "yes" : "no");
-
-	_region->add_extra_xml (*node);
-}
-
-void
-AudioRegionView::set_flags (XMLNode* node)
-{
-	XMLProperty *prop;
-
-	if ((prop = node->property ("waveform-visible")) != 0) {
-		if (string_is_affirmative (prop->value())) {
-			_flags |= WaveformVisible;
-		}
-	}
-
-	if ((prop = node->property ("waveform-rectified")) != 0) {
-		if (string_is_affirmative (prop->value())) {
-			_flags |= WaveformRectified;
-		}
-	}
-
-	if ((prop = node->property ("waveform-logscaled")) != 0) {
-		if (string_is_affirmative (prop->value())) {
-			_flags |= WaveformLogScaled;
-		}
+	for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+		(*wave)->property_rectified() = Config->get_waveform_shape() == Rectified;
 	}
 }
 
 void
-AudioRegionView::set_waveform_shape (WaveformShape shape)
+AudioRegionView::setup_waveform_scale ()
 {
-	bool yn;
-
-	/* this slightly odd approach is to leave the door open to
-	   other "shapes" such as spectral displays, etc.
-	*/
-
-	switch (shape) {
-	case Rectified:
-		yn = true;
-		break;
-
-	default:
-		yn = false;
-		break;
-	}
-
-	if (yn != (bool) (_flags & WaveformRectified)) {
-		for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
-			(*wave)->property_rectified() = yn;
-		}
-
-		if (yn) {
-			_flags |= WaveformRectified;
-		} else {
-			_flags &= ~WaveformRectified;
-		}
-		store_flags ();
-	}
-}
-
-void
-AudioRegionView::set_waveform_scale (WaveformScale scale)
-{
-	bool yn = (scale == Logarithmic);
-
-	if (yn != (bool) (_flags & WaveformLogScaled)) {
-		for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
-			(*wave)->property_logscaled() = yn;
-		}
-
-		if (yn) {
-			_flags |= WaveformLogScaled;
-		} else {
-			_flags &= ~WaveformLogScaled;
-		}
-		store_flags ();
+	for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
+		(*wave)->property_logscaled() = Config->get_waveform_scale() == Logarithmic;
 	}
 }
 
@@ -1794,7 +1712,7 @@ AudioRegionView::drag_start ()
 		AudioStreamView* av = atav->audio_view();
 		if (av) {
 			/* this will hide our xfades too */
-			av->hide_xfades_with (audio_region());
+			_hidden_xfades = av->hide_xfades_with (audio_region());
 		}
 	}
 }
@@ -1803,5 +1721,22 @@ void
 AudioRegionView::drag_end ()
 {
 	TimeAxisViewItem::drag_end ();
-	/* fades will be redrawn if they changed */
+
+	for (list<AudioRegionView*>::iterator i = _hidden_xfades.begin(); i != _hidden_xfades.end(); ++i) {
+		(*i)->show_xfades ();
+	}
+
+	_hidden_xfades.clear ();
+}
+
+void
+AudioRegionView::parameter_changed (string const & p)
+{
+	if (p == "show-waveforms") {
+		setup_waveform_visibility ();
+	} else if (p == "waveform-scale") {
+		setup_waveform_scale ();
+	} else if (p == "waveform-shape") {
+		setup_waveform_shape ();
+	}
 }
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 773e136952..ee03fdbc80 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -80,13 +80,6 @@ class AudioRegionView : public RegionView
 	void unhide_envelope ();           ///< Dangerous!
 
 	void update_envelope_visibility ();
-	void set_waveform_visible (bool yn);
-	void set_waveform_shape (ARDOUR::WaveformShape);
-	void set_waveform_scale (ARDOUR::WaveformScale);
-
-	bool waveform_rectified() const { return _flags & WaveformRectified; }
-	bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
-	bool waveform_visible()   const { return _flags & WaveformVisible; }
 
 	void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
 	void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
@@ -165,7 +158,6 @@ class AudioRegionView : public RegionView
 
 	double _amplitude_above_axis;
 
-	uint32_t _flags;
 	uint32_t fade_color;
 
 	void reset_fade_shapes ();
@@ -183,8 +175,6 @@ class AudioRegionView : public RegionView
 
 	void create_one_wave (uint32_t, bool);
 	void peaks_ready_handler (uint32_t);
-	void set_flags (XMLNode *);
-	void store_flags ();
 
 	void set_colors ();
 	void compute_colors (Gdk::Color const &);
@@ -203,10 +193,18 @@ class AudioRegionView : public RegionView
 private:
 	void setup_fade_handle_positions ();
 
+	void parameter_changed (std::string const &);
+	void setup_waveform_visibility ();
+	void setup_waveform_shape ();
+	void setup_waveform_scale ();
+
 	/** A ScopedConnection for each PeaksReady callback (one per channel).  Each member
 	 *  may be 0 if no connection exists.
 	 */
 	std::vector<PBD::ScopedConnection*> _data_ready_connections;
+
+	/** RegionViews that we hid the xfades for at the start of the current drag */
+	std::list<AudioRegionView*> _hidden_xfades;
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 22e07c0ec9..80ed198ab1 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -60,8 +60,6 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
 {
 	color_handler ();
 	_amplitude_above_axis = 1.0;
-
-	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::parameter_changed, this, _1), gui_context());
 }
 
 int
@@ -132,10 +130,6 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
 		region_view->set_sensitive (false);
 	}
 
-	region_view->set_waveform_scale (Config->get_waveform_scale ());
-	region_view->set_waveform_shape (Config->get_waveform_shape ());
-	region_view->set_waveform_visible (Config->get_show_waveforms ());
-
 	return region_view;
 }
 
@@ -208,38 +202,6 @@ AudioStreamView::redisplay_track ()
 	layer_regions();
 }
 
-void
-AudioStreamView::set_show_waveforms (bool yn)
-{
-	for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-		if (arv) {
-			arv->set_waveform_visible (yn);
-		}
-	}
-}
-
-void
-AudioStreamView::set_waveform_shape (WaveformShape shape)
-{
-	for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-		if (arv)
-			arv->set_waveform_shape (shape);
-	}
-}
-
-void
-AudioStreamView::set_waveform_scale (WaveformScale scale)
-{
-	for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-		if (arv) {
-			arv->set_waveform_scale (scale);
-		}
-	}
-}
-
 void
 AudioStreamView::setup_rec_box ()
 {
@@ -530,9 +492,14 @@ AudioStreamView::hide_all_fades ()
 	}
 }
 
-void
+/** Hide xfades for regions that overlap ar.
+ *  @return AudioRegionViews that xfades were hidden for.
+ */
+list<AudioRegionView*>
 AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
 {
+	list<AudioRegionView*> hidden;
+	
 	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
 		if (arv) {
@@ -541,10 +508,13 @@ AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
 				break;
 			default:
 				arv->hide_xfades ();
+				hidden.push_back (arv);
 				break;
 			}
 		}
 	}
+
+	return hidden;
 }
 
 void
@@ -564,16 +534,3 @@ AudioStreamView::color_handler ()
 		}
 	}
 }
-
-void
-AudioStreamView::parameter_changed (string const & p)
-{
-	if (p == "show-waveforms") {
-		set_show_waveforms (Config->get_show_waveforms ());
-	} else if (p == "waveform-scale") {
-		set_waveform_scale (Config->get_waveform_scale ());
-	} else if (p == "waveform-shape") {
-		set_waveform_shape (Config->get_waveform_shape ());
-	}
-}
-
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index 5ef83b7adc..a36c57b552 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -56,12 +56,10 @@ class AudioStreamView : public StreamView
 	int     set_amplitude_above_axis (gdouble app);
 	gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
 
-	void set_show_waveforms (bool yn);
-
 	void show_all_fades ();
 	void hide_all_fades ();
 
-	void hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
+	std::list<AudioRegionView*> hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
@@ -77,10 +75,6 @@ class AudioStreamView : public StreamView
 
 	void color_handler ();
 
-	void parameter_changed (std::string const &);
-	void set_waveform_shape (ARDOUR::WaveformShape);
-	void set_waveform_scale (ARDOUR::WaveformScale);
-
 	double _amplitude_above_axis;
 
 	std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index d77de07359..75be80fb3f 100644
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -5,6 +5,7 @@
 
 #include "ardour_ui.h"
 #include "canvas-flag.h"
+#include "canvas-noevent-pixbuf.h"
 #include "time_axis_view_item.h"
 #include "utils.h"
 
@@ -28,7 +29,6 @@ CanvasFlag::CanvasFlag (MidiRegionView& region,
 	, _line(0)
 	, _rect(0)
 {
-	signal_event().connect (sigc::mem_fun (*this, &CanvasFlag::on_event));
 }
 
 void
@@ -49,7 +49,7 @@ CanvasFlag::set_text (const string& text)
 {
 	delete_allocated_objects();
 
-	_name_pixbuf = new ArdourCanvas::Pixbuf (*this);
+	_name_pixbuf = new ArdourCanvas::NoEventPixbuf (*this);
 	name_pixbuf_width = Gtkmm2ext::pixel_width (text, TimeAxisViewItem::NAME_FONT) + 2;
 	Gdk::Color c;
 	set_color (c, _outline_color_rgba);
@@ -75,15 +75,6 @@ CanvasFlag::~CanvasFlag()
 	delete_allocated_objects();
 }
 
-bool
-CanvasFlag::on_event(GdkEvent* /*ev*/)
-{
-	/* XXX if you change this function to actually do anything, be sure
-	   to fix the connections commented out elsewhere in this file.
-	*/
-	return false;
-}
-
 void
 CanvasFlag::set_height (double h)
 {
diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index 17edc19880..4ad41ec883 100644
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -28,8 +28,6 @@ public:
 
 	virtual ~CanvasFlag();
 
-	virtual bool on_event(GdkEvent* ev);
-
 	virtual void set_text(const std::string& a_text);
 	virtual void set_height (double);
 
diff --git a/gtk2_ardour/canvas-noevent-pixbuf.h b/gtk2_ardour/canvas-noevent-pixbuf.h
new file mode 100644
index 0000000000..4424a9087e
--- /dev/null
+++ b/gtk2_ardour/canvas-noevent-pixbuf.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2009 Paul Davis <paul@linuxaudiosystems.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __gtk2_ardour_canvas_noevent_pixbuf_h__
+#define __gtk2_ardour_canvas_noevent_pixbuf_h__
+
+#include <libgnomecanvasmm/pixbuf.h>
+
+namespace Gnome { namespace Canvas {
+
+class NoEventPixbuf : public Pixbuf
+{
+  public:
+    NoEventPixbuf(Group& parent) : Pixbuf (parent) {}
+
+    double point_vfunc(double, double, int, int, GnomeCanvasItem**) {
+	    /* return a huge value to tell the canvas that we're never the item for an event */
+	    return 9999999999999.0;
+    }
+};
+
+} } /* namespaces */
+
+#endif /* __gtk2_ardour_canvas_noevent_pixbuf_h__ */
diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc
index ff28295c6e..29e30e332d 100644
--- a/gtk2_ardour/canvas_patch_change.cc
+++ b/gtk2_ardour/canvas_patch_change.cc
@@ -21,6 +21,8 @@
 
 #include <boost/algorithm/string.hpp>
 
+#include "pbd/stacktrace.h"
+
 #include "gtkmm2ext/keyboard.h"
 #include "ardour/instrument_info.h"
 
@@ -81,41 +83,60 @@ CanvasPatchChange::initialize_popup_menus()
 
 	const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks();
 
-	// fill popup menu:
-	Gtk::Menu::MenuList& patch_bank_menus = _popup.items();
-
-	for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
-	     bank != patch_banks.end();
-	     ++bank) {
-		Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
-
-		const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
-		Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
+	if (patch_banks.size() > 1) {
+		// fill popup menu:
+		Gtk::Menu::MenuList& patch_bank_menus = _popup.items();
+		
+		for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
+		     bank != patch_banks.end();
+		     ++bank) {
+			Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
+			
+			const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
+			Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
+			
+			for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
+			     patch != patches.end();
+			     ++patch) {
+				std::string name = (*patch)->name();
+				boost::replace_all (name, "_", " ");
+				
+				patch_menus.push_back(
+					Gtk::Menu_Helpers::MenuElem(
+						name,
+						sigc::bind(
+							sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected),
+							(*patch)->patch_primary_key())) );
+			}
+			
+			std::string name = (*bank)->name();
+			boost::replace_all (name, "_", " ");
+			
+			patch_bank_menus.push_back(
+				Gtk::Menu_Helpers::MenuElem(
+					name,
+					patch_bank_menu) );
+		}
+	} else {
+		/* only one patch bank, so make it the initial menu */
 
+		const PatchBank::PatchNameList& patches = patch_banks.front()->patch_name_list();
+		Gtk::Menu::MenuList& patch_menus = _popup.items();
+		
 		for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
 		     patch != patches.end();
 		     ++patch) {
 			std::string name = (*patch)->name();
 			boost::replace_all (name, "_", " ");
-
-			patch_menus.push_back(
-				Gtk::Menu_Helpers::MenuElem(
-					name,
-					sigc::bind(
-						sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected),
-						(*patch)->patch_primary_key())) );
+			
+			patch_menus.push_back (Gtk::Menu_Helpers::MenuElem (name, 
+									    sigc::bind (
+										    sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected),
+										    (*patch)->patch_primary_key())));
 		}
-
-		std::string name = (*bank)->name();
-		boost::replace_all (name, "_", " ");
-
-		patch_bank_menus.push_back(
-			Gtk::Menu_Helpers::MenuElem(
-				name,
-				patch_bank_menu) );
 	}
 }
-
+	
 void
 CanvasPatchChange::on_patch_menu_selected(const PatchPrimaryKey& key)
 {
@@ -125,11 +146,12 @@ CanvasPatchChange::on_patch_menu_selected(const PatchPrimaryKey& key)
 bool
 CanvasPatchChange::on_event (GdkEvent* ev)
 {
+	Editor* e;
+
 	switch (ev->type) {
 	case GDK_BUTTON_PRESS:
-	{
 		/* XXX: icky dcast */
-		Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+		e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
 		if (e->current_mouse_mode() == Editing::MouseObject && e->internal_editing()) {
 
 			if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
@@ -159,7 +181,6 @@ CanvasPatchChange::on_event (GdkEvent* ev)
 			return true;
 		}
 		break;
-	}
 
 	case GDK_KEY_PRESS:
 		switch (ev->key.keyval) {
@@ -181,15 +202,18 @@ CanvasPatchChange::on_event (GdkEvent* ev)
 				_region.next_patch (*this);
 			}
 			break;
+		case GDK_Delete:
+		case GDK_BackSpace:
+			_region.delete_patch_change (this);
+			break;
 		default:
 			break;
 		}
 		break;
 
 	case GDK_SCROLL:
-	{
 		/* XXX: icky dcast */
-		Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+		e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
 		if (e->current_mouse_mode() == Editing::MouseObject && e->internal_editing()) {
 			if (ev->scroll.direction == GDK_SCROLL_UP) {
 				if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
@@ -197,25 +221,26 @@ CanvasPatchChange::on_event (GdkEvent* ev)
 				} else {
 					_region.previous_patch (*this);
 				}
-				return true;
 			} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
 				if (Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::PrimaryModifier)) {
 					_region.next_bank (*this);
 				} else {
 					_region.next_patch (*this);
 				}
-				return true;
 			}
+			return true;
 			break;
 		}
-        }
+		break;
 
 	case GDK_ENTER_NOTIFY:
 		_region.patch_entered (this);
+                return true;
 		break;
 
 	case GDK_LEAVE_NOTIFY:
 		_region.patch_left (this);
+                return true;
 		break;
 
 	default:
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 939c05b1e8..e3e00cf340 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -282,6 +282,7 @@ Editor::Editor ()
 	, _region_selection_change_updates_region_list (true)
 	, _following_mixer_selection (false)
 	, _control_point_toggled_on_press (false)
+	, _stepping_axis_view (0)
 {
 	constructed = false;
 
@@ -696,6 +697,8 @@ Editor::Editor ()
 	signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
 	signal_delete_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
 
+	Gtkmm2ext::Keyboard::the_keyboard().ShiftReleased.connect (sigc::mem_fun (*this, &Editor::shift_key_released));
+	
 	/* allow external control surfaces/protocols to do various things */
 
 	ControlProtocol::ZoomToSession.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_session, this), gui_context());
@@ -5473,3 +5476,8 @@ Editor::popup_control_point_context_menu (ArdourCanvas::Item* item, GdkEvent* ev
 	_control_point_context_menu.popup (event->button.button, event->button.time);
 }
 
+void
+Editor::shift_key_released ()
+{
+	_stepping_axis_view = 0;
+}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 5134b6a7a1..3fd38ec609 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -470,6 +470,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void get_pointer_position (double &, double &) const;
 
+	TimeAxisView* stepping_axis_view () {
+		return _stepping_axis_view;
+	}
+	
+	void set_stepping_axis_view (TimeAxisView* v) {
+		_stepping_axis_view = v;
+	}
+
   protected:
 	void map_transport_state ();
 	void map_position_change (framepos_t);
@@ -624,6 +632,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void hide_marker (ArdourCanvas::Item*, GdkEvent*);
 	void clear_marker_display ();
 	void mouse_add_new_marker (framepos_t where, bool is_cd=false, bool is_xrun=false);
+	void mouse_add_new_range (framepos_t);
 	bool choose_new_marker_name(std::string &name);
 	void update_cd_marker_display ();
 	void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
@@ -2102,6 +2111,17 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	/** Flag for a bit of a hack wrt control point selection; see set_selected_control_point_from_click */
 	bool _control_point_toggled_on_press;
 
+	/** This is used by TimeAxisView to keep a track of the TimeAxisView that is currently being
+	    stepped in height using Shift-Scrollwheel.  When a scroll event occurs, we do the step on
+	    this _stepping_axis_view if it is non-0 (and we set up this _stepping_axis_view with the
+	    TimeAxisView underneath the mouse if it is 0).  Then Editor resets _stepping_axis_view when
+	    the shift key is released.  In this (hacky) way, pushing shift and moving the scroll wheel
+	    will operate on the same track until shift is released (rather than skipping about to whatever
+	    happens to be underneath the mouse at the time).
+	*/
+	TimeAxisView* _stepping_axis_view;
+	void shift_key_released ();
+
 	friend class Drag;
 	friend class RegionDrag;
 	friend class RegionMoveDrag;
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 9e43fcc35c..3e7aad2a1b 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -501,6 +501,10 @@ Editor::autoscroll_fudge_threshold () const
 void
 Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool moving_left, bool moving_up)
 {
+	if (!Config->get_autoscroll_editor ()) {
+		return;
+	}
+	
 	bool startit = false;
 
 	/* Work out the distance between the right hand edge of the trackview and the edge of
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index e5eb7630c0..ae3795f7fa 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1823,6 +1823,10 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
 		_editor->motion_frozen_playlists.clear ();
 		_editor->commit_reversible_command();
 
+		for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
+			i->view->drag_end ();
+		}
+
 	} else {
 		/* no mouse movement */
 		_editor->point_trim (event, adjusted_current_frame (event));
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 46f4a0ddd5..28706ac7bc 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -661,6 +661,31 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
 	}
 }
 
+void
+Editor::mouse_add_new_range (framepos_t where)
+{
+	if (!_session) {
+		return;
+	}
+
+	/* Make this marker 1/8th of the visible area of the session so that
+	   it's reasonably easy to manipulate after creation.
+	*/
+
+	framepos_t const end = where + current_page_frames() / 8;
+
+	string name;
+	_session->locations()->next_available_name (name, _("range"));
+	Location* loc = new Location (*_session, where, end, name, Location::IsRangeMarker);
+
+	begin_reversible_command (_("new range marker"));
+	XMLNode& before = _session->locations()->get_state ();
+	_session->locations()->add (loc, true);
+	XMLNode& after = _session->locations()->get_state ();
+	_session->add_command (new MementoCommand<Locations> (*_session->locations(), &before, &after));
+	commit_reversible_command ();
+}
+
 void
 Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 {
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 05ecc23c32..eacf0c51bd 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -3393,7 +3393,6 @@ Editor::freeze_thread ()
 	/* create event pool because we may need to talk to the session */
 	SessionEvent::create_per_thread_pool ("freeze events", 64);
 	/* create per-thread buffers for process() tree to use */
-	current_interthread_info->process_thread.init ();
 	current_interthread_info->process_thread.get_buffers ();
 	clicked_routeview->audio_track()->freeze_me (*current_interthread_info);
 	current_interthread_info->done = true;
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index ea5622e4c9..ac771c42f0 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -342,7 +342,7 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
 		ruler_items.push_back (SeparatorElem ());
 		break;
 	case RangeMarkerBarItem:
-		//ruler_items.push_back (MenuElem (_("New Range")));
+		ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
 		ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
 		ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
 		ruler_items.push_back (SeparatorElem ());
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index ea6a3f544c..9f027ea8bf 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -322,7 +322,7 @@ LocationEditRow::set_location (Location *loc)
 		length_clock.hide();
 	}
 
-	set_clock_sensitivity ();
+	set_clock_editable_status ();
 
 	--i_am_the_modifier;
 
@@ -632,7 +632,7 @@ LocationEditRow::location_changed (ARDOUR::Location*)
 	end_clock.set (location->end());
 	length_clock.set (location->length());
 
-	set_clock_sensitivity ();
+	set_clock_editable_status ();
 
 	i_am_the_modifier--;
 
@@ -665,7 +665,7 @@ LocationEditRow::lock_changed (ARDOUR::Location*)
 
 	lock_check_button.set_active (location->locked());
 
-	set_clock_sensitivity ();
+	set_clock_editable_status ();
 
 	i_am_the_modifier--;
 }
@@ -691,11 +691,11 @@ LocationEditRow::focus_name()
 }
 
 void
-LocationEditRow::set_clock_sensitivity ()
+LocationEditRow::set_clock_editable_status ()
 {
-	start_clock.set_sensitive (!location->locked());
-	end_clock.set_sensitive (!location->locked());
-	length_clock.set_sensitive (!location->locked());
+	start_clock.set_editable (!location->locked());
+	end_clock.set_editable (!location->locked());
+	length_clock.set_editable (!location->locked());
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index b850b89ddd..b01b63e8e4 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -139,7 +139,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void lock_changed (ARDOUR::Location *);
 	void position_lock_style_changed (ARDOUR::Location *);
 
-	void set_clock_sensitivity ();
+	void set_clock_editable_status ();
 
 	PBD::ScopedConnectionList connections;
 };
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index e2120e112a..7e8f827596 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -268,6 +268,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 			_ardour_buttons_box->pack_end (save_button, false, false);
 			_ardour_buttons_box->pack_end (add_button, false, false);
 			_ardour_buttons_box->pack_end (_preset_combo, false, false);
+			_ardour_buttons_box->pack_end (_preset_modified, false, false);
 			_ardour_buttons_box->show_all();
 			pack_start(*_ardour_buttons_box, false, false);
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 0bf73ed5bf..a1562aa137 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -186,31 +186,24 @@ fixup_bundle_environment (int, char* [])
 	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
 		error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
 		      << endmsg;
-		return;
-	} 
-
-	path = Glib::build_filename (userconfigdir, "pango.rc");
-	std::ofstream pangorc (path.c_str());
-	if (!pangorc) {
-		error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
 	} else {
-		pangorc << "[Pango]\nModuleFiles="
-			<< Glib::build_filename (bundle_dir, "Resources/pango.modules") 
-			<< endl;
-		pangorc.close ();
-
-		setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		
+		path = Glib::build_filename (userconfigdir, "pango.rc");
+		std::ofstream pangorc (path.c_str());
+		if (!pangorc) {
+			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+		} else {
+			pangorc << "[Pango]\nModuleFiles="
+				<< Glib::build_filename (bundle_dir, "Resources/pango.modules") 
+				<< endl;
+			pangorc.close ();
+			
+			setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		}
 	}
-
-	// gettext charset aliases XXX do we really need this, since the path
-	// is totally wrong?
-
-	setenv ("CHARSETALIASDIR", path.c_str(), 1);
-
+	
+	setenv ("CHARSETALIASDIR", bundle_dir.c_str(), 1);
 	setenv ("FONTCONFIG_FILE", Glib::build_filename (bundle_dir, "Resources/fonts.conf").c_str(), 1);
-
-	// GDK Pixbuf loader module file
-
 	setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
 
         // Where to find soundgrid library (if it exists)
@@ -286,27 +279,33 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 	if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
 		error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
 		      << endmsg;
-		return;
-	} 
-
-	path = Glib::build_filename (userconfigdir, "pango.rc");
-	std::ofstream pangorc (path.c_str());
-	if (!pangorc) {
-		error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
 	} else {
-		pangorc << "[Pango]\nModuleFiles="
-			<< Glib::build_filename (userconfigdir, "pango.modules")
-			<< endl;
-		pangorc.close ();
+		
+		path = Glib::build_filename (userconfigdir, "pango.rc");
+		std::ofstream pangorc (path.c_str());
+		if (!pangorc) {
+			error << string_compose (_("cannot open pango.rc file %1") , path) << endmsg;
+		} else {
+			pangorc << "[Pango]\nModuleFiles="
+				<< Glib::build_filename (userconfigdir, "pango.modules")
+				<< endl;
+			pangorc.close ();
+		}
+		
+		setenv ("PANGO_RC_FILE", path.c_str(), 1);
+		
+		/* similar for GDK pixbuf loaders, but there's no RC file required
+		   to specify where it lives.
+		*/
+		
+		setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
 	}
-	
-	setenv ("PANGO_RC_FILE", path.c_str(), 1);
 
-	/* similar for GDK pixbuf loaders, but there's no RC file required
-	   to specify where it lives.
-	*/
-	
-	setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (userconfigdir, "gdk-pixbuf.loaders").c_str(), 1);
+        /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
+           from looking outside the bundle to find the charset.alias file.
+        */
+        setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
+
 }
 
 #endif
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 20fc0ed433..774c6fccf7 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -1,19 +1,19 @@
 /*
     Copyright (C) 2009 Paul Davis
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <cmath>
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c2d706382e..ce02bf0149 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -277,8 +277,7 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 	reset_width_dependent_items (_pixel_width);
 
 	group->raise_to_top();
-	group->signal_event().connect(
-		sigc::mem_fun(this, &MidiRegionView::canvas_event), false);
+	group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false);
 
 	midi_view()->signal_channel_mode_changed().connect(
 		sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
@@ -322,7 +321,7 @@ bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
 	bool r;
-	
+
 	switch (ev->type) {
 	case GDK_ENTER_NOTIFY:
 	case GDK_LEAVE_NOTIFY:
@@ -714,7 +713,11 @@ MidiRegionView::key_press (GdkEventKey* ev)
 
 		return true;
 
-	} else if (ev->keyval == GDK_Delete && unmodified) {
+	} else if ((ev->keyval == GDK_BackSpace || ev->keyval == GDK_Delete) && unmodified) {
+
+		if (_selection.empty()) {
+			return false;
+		}
 
 		delete_selection();
 		return true;
@@ -925,9 +928,9 @@ MidiRegionView::create_note_at (framepos_t t, double y, double length, bool snap
 }
 
 void
-MidiRegionView::clear_events()
+MidiRegionView::clear_events (bool with_selection_signal)
 {
-	clear_selection();
+	clear_selection (with_selection_signal);
 
 	MidiGhostRegion* gr;
 	for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
@@ -1316,7 +1319,7 @@ MidiRegionView::~MidiRegionView ()
 	_selection_cleared_connection.disconnect ();
 
 	_selection.clear();
-	clear_events();
+	clear_events (false);
 
 	delete _note_group;
 	delete _note_diff_command;
@@ -1798,7 +1801,7 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const
 	double const height = midi_stream_view()->contents_height();
 
 	boost::shared_ptr<CanvasPatchChange> patch_change = boost::shared_ptr<CanvasPatchChange>(
-		new CanvasPatchChange(*this, *_note_group,
+		new CanvasPatchChange(*this, *group,
 		                      displaytext,
 		                      height,
 		                      x, 1.0,
@@ -3139,18 +3142,24 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
 }
 
 void
-MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
+MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* p)
 {
 	ostringstream s;
 	/* XXX should get patch name if we can */
-	s << _("Bank:") << (ev->patch()->bank() + MIDI_BP_ZERO) << '\n' << _("Program:") << ((int) ev->patch()->program()) + MIDI_BP_ZERO << '\n' << _("Channel:") << ((int) ev->patch()->channel() + 1);
+	s << _("Bank:") << (p->patch()->bank() + MIDI_BP_ZERO) << '\n' 
+	  << _("Program:") << ((int) p->patch()->program()) + MIDI_BP_ZERO << '\n' 
+	  << _("Channel:") << ((int) p->patch()->channel() + 1);
 	show_verbose_cursor (s.str(), 10, 20);
+	p->grab_focus();
 }
 
 void
 MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *)
 {
 	trackview.editor().verbose_cursor()->hide ();
+	/* focus will transfer back via the enter-notify event sent to this
+	 * midi region view.
+	 */
 }
 
 void
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 86600e8b8d..7674ea245f 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -348,7 +348,7 @@ private:
 	void start_playing_midi_note (boost::shared_ptr<NoteType> note);
 	void start_playing_midi_chord (std::vector<boost::shared_ptr<NoteType> > notes);
 
-	void clear_events();
+	void clear_events (bool with_selection_signal = true);
 
 	bool canvas_event(GdkEvent* ev);
 	bool note_canvas_event(GdkEvent* ev);
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index f182c301d6..9a4200b4af 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -113,7 +113,6 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, Canvas& can
 	, _channel_color_mode_item(0)
 	, _track_color_mode_item(0)
 	, _step_edit_item (0)
-	, _midi_thru_item (0)
 	, controller_menu (0)
         , _step_editor (0)
 {
@@ -405,25 +404,9 @@ MidiTimeAxisView::append_extra_display_menu_items ()
 	items.push_back (MenuElem (_("Note Range"), *range_menu));
 	items.push_back (MenuElem (_("Note Mode"), *build_note_mode_menu()));
 
-	items.push_back (CheckMenuElem (_("MIDI Thru"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
-	_midi_thru_item = dynamic_cast<CheckMenuItem*>(&items.back());
-
 	items.push_back (SeparatorElem ());
 }
 
-void
-MidiTimeAxisView::toggle_midi_thru ()
-{
-	if (!_midi_thru_item) {
-		return;
-	}
-
-	bool view_yn = _midi_thru_item->get_active();
-	if (view_yn != midi_track()->midi_thru()) {
-		midi_track()->set_midi_thru (view_yn);
-	}
-}
-
 void
 MidiTimeAxisView::build_automation_action_menu (bool for_selection)
 {
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 4da89df109..8761979947 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -136,11 +136,8 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	Gtk::ComboBoxText            _custom_device_mode_selector;
 
 	Gtk::CheckMenuItem*          _step_edit_item;
-	Gtk::CheckMenuItem*          _midi_thru_item;
 	Gtk::Menu*                    default_channel_menu;
 
-	void toggle_midi_thru ();
-
 	void change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param);
 	void add_basic_parameter_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, Evoral::Parameter param);
 	void add_channel_command_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, ARDOUR::AutomationType auto_type, uint8_t cmd);
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index ff3fd54624..adce954a91 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -611,7 +611,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 		solo_isolated_led->set_text (_("iso"));
 		solo_safe_led->set_text (_("lock"));
 
-		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
+		Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
 		set_size_request (-1, -1);
 		break;
 
@@ -635,7 +635,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 		solo_isolated_led->set_text (_("i"));
 		solo_safe_led->set_text (_("L"));
 
-		Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
+		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
 		set_size_request (max (50, gpm.get_gm_width()), -1);
 		break;
 	}
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index e1946002c1..a6fcc734c5 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -163,6 +163,60 @@ EntryOption::activated ()
 	_set (_entry->get_text ());
 }
 
+/** Construct a BoolComboOption.
+ *  @param i id
+ *  @param n User-visible name.
+ *  @param t Text to give for the variable being true.
+ *  @param f Text to give for the variable being false.
+ *  @param g Slot to get the variable's value.
+ *  @param s Slot to set the variable's value.
+ */
+BoolComboOption::BoolComboOption (
+	string const & i, string const & n, string const & t, string const & f, 
+	sigc::slot<bool> g, sigc::slot<bool, bool> s
+	)
+	: Option (i, n)
+	, _get (g)
+	, _set (s)
+{
+	_label = manage (new Label (n + ":"));
+	_label->set_alignment (0, 0.5);
+	_combo = manage (new ComboBoxText);
+
+	/* option 0 is the false option */
+	_combo->append_text (f);
+	/* and option 1 is the true */
+	_combo->append_text (t);
+	
+	_combo->signal_changed().connect (sigc::mem_fun (*this, &BoolComboOption::changed));
+}
+
+void
+BoolComboOption::set_state_from_config ()
+{
+	_combo->set_active (_get() ? 1 : 0);
+}
+
+void
+BoolComboOption::add_to_page (OptionEditorPage* p)
+{
+	add_widgets_to_page (p, _label, _combo);
+}
+
+void
+BoolComboOption::changed ()
+{
+	_set (_combo->get_active_row_number () == 0 ? false : true);
+}
+
+void
+BoolComboOption::set_sensitive (bool yn)
+{
+	_combo->set_sensitive (yn);
+}
+	
+
+	  
 FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t> g, sigc::slot<bool, gain_t> s)
 	: Option (i, n)
 	, _db_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 5d6a48a024..b896411a71 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -192,7 +192,7 @@ private:
 };
 
 
-/** Component which provides the UI to handle an enumerated option using a GTK CheckButton.
+/** Component which provides the UI to handle an enumerated option using a GTK ComboBox.
  *  The template parameter is the enumeration.
  */
 template <class T>
@@ -273,6 +273,37 @@ private:
 };
 
 
+/** Component which provides the UI to handle a boolean option which needs
+ *  to be represented as a ComboBox to be clear to the user.
+ */
+class BoolComboOption : public Option
+{
+public:
+
+	BoolComboOption (
+		std::string const &,
+		std::string const &,
+		std::string const &,
+		std::string const &,
+		sigc::slot<bool>,
+		sigc::slot<bool, bool>
+		);
+
+	void set_state_from_config ();
+	void add_to_page (OptionEditorPage *);
+	void changed ();
+	void set_sensitive (bool);
+
+private:
+
+	sigc::slot<bool> _get;
+	sigc::slot<bool, bool> _set;
+	Gtk::Label* _label;
+	Gtk::ComboBoxText* _combo;
+};
+
+
+
 /** Component which provides the UI to handle an numeric option using a GTK SpinButton */
 template <class T>
 class SpinOption : public Option
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 455cea1364..169928843a 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -593,6 +593,9 @@ PlugUIBase::preset_selected ()
 			warning << string_compose(_("Plugin preset %1 not found"),
 						  _preset_combo.get_active_text()) << endmsg;
 		}
+	} else {
+		// blank selected = no preset
+		plugin->clear_preset();
 	}
 }
 
@@ -745,6 +748,8 @@ PlugUIBase::update_preset_list ()
 		preset_labels.push_back (i->label);
 	}
 
+	preset_labels.push_back("");
+
 	set_popdown_strings (_preset_combo, preset_labels);
 
 	--_no_load_preset;
@@ -768,6 +773,7 @@ PlugUIBase::update_preset ()
 void
 PlugUIBase::update_preset_modified ()
 {
+
 	if (plugin->last_preset().uri.empty()) {
 		_preset_modified.set_text ("");
 		return;
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 7f0d9fb9f3..8465cdcd32 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -969,6 +969,10 @@ PortMatrix::port_connected_or_disconnected ()
 void
 PortMatrix::update_tab_highlighting ()
 {
+	if (!_session) {
+		return;
+	}
+	
 	for (int i = 0; i < 2; ++i) {
 
 		Gtk::Notebook* notebook = row_index() == i ? &_vnotebook : &_hnotebook;
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 4d12c8e739..9ba83021d5 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1063,9 +1063,11 @@ RCOptionEditor::RCOptionEditor ()
 		     ));
 
 	add_option (_("Editor"),
-	     new BoolOption (
+	     new BoolComboOption (
 		     "show-region-gain-envelopes",
 		     _("Show gain envelopes in audio regions"),
+		     _("in all modes"),
+		     _("only in region gain mode"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_region_gain),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_region_gain)
 		     ));
@@ -1150,6 +1152,14 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
 		     ));
 
+	add_option (_("Editor"),
+	    new BoolOption (
+		    "autoscroll-editor",
+		    _("Auto-scroll editor window when dragging near its edges"),
+		    sigc::mem_fun (*_rc_config, &RCConfiguration::get_autoscroll_editor),
+		    sigc::mem_fun (*_rc_config, &RCConfiguration::set_autoscroll_editor)
+		    ));
+
 	/* AUDIO */
 
 	add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
@@ -1587,7 +1597,7 @@ RCOptionEditor::RCOptionEditor ()
 	add_option (S_("Visual|Interface"),
 	     new BoolOption (
 		     "default-narrow_ms",
-		     _("Use narrow mixer strips by default"),
+		     _("Use narrow strips in the mixer by default"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
 		     ));
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index da39d45db6..bff119d29d 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -582,6 +582,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 
 
 	notebook.set_size_request (500, -1);
+	notebook.signal_switch_page().connect (
+		sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options))))
+		);
 
 	set_session (s);
 
@@ -1016,6 +1019,7 @@ SoundFileOmega::reset_options ()
 		channel_combo.set_sensitive (false);
 		action_combo.set_sensitive (false);
 		where_combo.set_sensitive (false);
+		copy_files_btn.set_active (true);
 		copy_files_btn.set_sensitive (false);
 
 		return false;
@@ -1028,7 +1032,7 @@ SoundFileOmega::reset_options ()
 
 		/* if we get through this function successfully, this may be
 		   reset at the end, once we know if we can use hard links
-		   to do embedding
+		   to do embedding (or if we are importing a MIDI file).
 		*/
 
 		if (Config->get_only_copy_imported_files()) {
@@ -1044,6 +1048,13 @@ SoundFileOmega::reset_options ()
 	bool selection_can_be_embedded_with_links = check_link_status (_session, paths);
 	ImportMode mode;
 
+	/* See if we are thinking about importing any MIDI files */
+	vector<string>::iterator i = paths.begin ();
+	while (i != paths.end() && SMFSource::safe_midi_file_extension (*i) == false) {
+		++i;
+	}
+	bool const have_a_midi_file = (i != paths.end ());
+
 	if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
 		Glib::signal_idle().connect (sigc::mem_fun (*this, &SoundFileOmega::bad_file_message));
 		return false;
@@ -1194,17 +1205,26 @@ SoundFileOmega::reset_options ()
 		src_combo.set_sensitive (false);
 	}
 
+	/* We must copy MIDI files or those from Freesound */
+	bool const must_copy = have_a_midi_file || notebook.get_current_page() == 2;
+	
 	if (Config->get_only_copy_imported_files()) {
 
-		if (selection_can_be_embedded_with_links) {
+		if (selection_can_be_embedded_with_links && !must_copy) {
 			copy_files_btn.set_sensitive (true);
 		} else {
+			if (must_copy) {
+				copy_files_btn.set_active (true);
+			}
 			copy_files_btn.set_sensitive (false);
 		}
 
 	}  else {
 
-		copy_files_btn.set_sensitive (true);
+		if (must_copy) {
+			copy_files_btn.set_active (true);
+		}			
+		copy_files_btn.set_sensitive (!must_copy);
 	}
 
 	return true;
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index ddf03e968e..ee5c7c1c2a 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -48,6 +48,7 @@
 #include "utils.h"
 #include "streamview.h"
 #include "editor_drag.h"
+#include "editor.h"
 
 #include "i18n.h"
 
@@ -317,7 +318,12 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-			step_height (false);
+			/* See Editor::_stepping_axis_view for notes on this hack */
+			Editor& e = dynamic_cast<Editor&> (_editor);
+			if (!e.stepping_axis_view ()) {
+				e.set_stepping_axis_view (this);
+			}
+			e.stepping_axis_view()->step_height (false);
 			return true;
 		} else if (Keyboard::no_modifiers_active (ev->state)) {
 			_editor.scroll_tracks_up_line();
@@ -327,7 +333,12 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 
 	case GDK_SCROLL_DOWN:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-			step_height (true);
+			/* See Editor::_stepping_axis_view for notes on this hack */
+			Editor& e = dynamic_cast<Editor&> (_editor);
+			if (!e.stepping_axis_view ()) {
+				e.set_stepping_axis_view (this);
+			}
+			e.stepping_axis_view()->step_height (true);
 			return true;
 		} else if (Keyboard::no_modifiers_active (ev->state)) {
 			_editor.scroll_tracks_down_line();
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 5fdc0ac041..e38c98ea05 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -46,16 +46,11 @@ namespace Properties {
 	extern PBD::PropertyDescriptor<bool> fade_in_active;
 	extern PBD::PropertyDescriptor<bool> fade_out_active;
 	extern PBD::PropertyDescriptor<float> scale_amplitude;
-
-	/* the envelope and fades are not scalar items and so
-	   currently (2010/02) are not stored using Property.
-	   However, these descriptors enable us to notify
-	   about changes to them via PropertyChange.
-	*/
-
-	extern PBD::PropertyDescriptor<bool> envelope;
-	extern PBD::PropertyDescriptor<bool> fade_in;
-	extern PBD::PropertyDescriptor<bool> fade_out;
+	extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
+	extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
+	extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;
+	extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_out;
+	extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > envelope;
 }
 
 class Playlist;
@@ -99,11 +94,11 @@ class AudioRegion : public Region
 	bool fade_out_is_short() const { return _fade_out_is_short; }
 	void set_fade_out_is_short (bool yn);
 
-	boost::shared_ptr<AutomationList> fade_in()  { return _fade_in; }
-	boost::shared_ptr<AutomationList> inverse_fade_in()  { return _inverse_fade_in; }
-	boost::shared_ptr<AutomationList> fade_out() { return _fade_out; }
-	boost::shared_ptr<AutomationList> inverse_fade_out()  { return _inverse_fade_out; }
-	boost::shared_ptr<AutomationList> envelope() { return _envelope; }
+	boost::shared_ptr<AutomationList> fade_in()  { return _fade_in.val (); }
+	boost::shared_ptr<AutomationList> inverse_fade_in()  { return _inverse_fade_in.val (); }
+	boost::shared_ptr<AutomationList> fade_out() { return _fade_out.val (); }
+	boost::shared_ptr<AutomationList> inverse_fade_out()  { return _inverse_fade_out.val (); }
+	boost::shared_ptr<AutomationList> envelope() { return _envelope.val (); }
 
 	Evoral::Range<framepos_t> body_range () const;
 
@@ -231,15 +226,15 @@ class AudioRegion : public Region
 	void connect_to_analysis_changed ();
 	void connect_to_header_position_offset_changed ();
 
-	Automatable _automatable;
 
-	boost::shared_ptr<AutomationList> _fade_in;
-	boost::shared_ptr<AutomationList> _inverse_fade_in;
-	boost::shared_ptr<AutomationList> _fade_out;
-	boost::shared_ptr<AutomationList> _inverse_fade_out;
-	boost::shared_ptr<AutomationList> _envelope;
-	uint32_t                          _fade_in_suspended;
-	uint32_t                          _fade_out_suspended;
+	AutomationListProperty _fade_in;
+	AutomationListProperty _inverse_fade_in;
+	AutomationListProperty _fade_out;
+	AutomationListProperty _inverse_fade_out;
+	AutomationListProperty _envelope;
+	Automatable            _automatable;
+	uint32_t               _fade_in_suspended;
+	uint32_t               _fade_out_suspended;
 
 	boost::shared_ptr<ARDOUR::Region> get_single_other_xfade_region (bool start) const;
 
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 58d1fe4acf..01c9d0641a 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -29,6 +29,7 @@
 #include "pbd/undo.h"
 #include "pbd/xml++.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/properties.h"
 
 #include "ardour/ardour.h"
 
@@ -36,6 +37,28 @@
 
 namespace ARDOUR {
 
+class AutomationList;
+
+/** A SharedStatefulProperty for AutomationLists */
+class AutomationListProperty : public PBD::SharedStatefulProperty<AutomationList>
+{
+public:
+	AutomationListProperty (PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > d, Ptr p)
+		: PBD::SharedStatefulProperty<AutomationList> (d.property_id, p)
+	{}
+
+	AutomationListProperty (PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > d, Ptr o, Ptr c)
+		: PBD::SharedStatefulProperty<AutomationList> (d.property_id, o, c)
+	{}
+	
+	PBD::PropertyBase* clone () const;
+	
+private:
+	/* No copy-construction nor assignment */
+	AutomationListProperty (AutomationListProperty const &);
+	AutomationListProperty& operator= (AutomationListProperty const &);
+};
+
 class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlList
 {
   public:
@@ -82,6 +105,8 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
 	XMLNode& state (bool full);
 	XMLNode& serialize_events ();
 
+	bool operator!= (const AutomationList &) const;
+
   private:
 	void create_curve_if_necessary ();
 	int deserialize_events (const XMLNode&);
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index 27e002ca66..baf9c959ae 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -31,6 +31,13 @@
 
 namespace ARDOUR {
 
+// a callback function for lilv_state_new_from_instance(). friend of LV2Plugin
+// so we can pass an LV2Plugin* in user_data and access its private members.
+const void* lv2plugin_get_port_value(const char* port_symbol,
+                                     void*       user_data,
+                                     uint32_t*   size,
+                                     uint32_t*   type);
+
 class AudioEngine;
 class Session;
 
@@ -159,6 +166,11 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	float*        _latency_control_port;  ///< Special output set by ardour
 	PBD::ID       _insert_id;
 
+	friend const void* lv2plugin_get_port_value(const char* port_symbol,
+	                                            void*       user_data,
+	                                            uint32_t*   size,
+	                                            uint32_t*   type);
+
 	typedef enum {
 		PORT_INPUT   = 1,
 		PORT_OUTPUT  = 1 << 1,
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 23ae7addb0..99513734da 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -63,6 +63,7 @@ class MidiDiskstream : public Diskstream
 	float capture_buffer_load() const;
 
 	void get_playback (MidiBuffer& dst, framecnt_t);
+        void flush_playback (framepos_t, framepos_t);
 
 	void set_record_enabled (bool yn);
 	
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 84575ca351..5dc55398cb 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -45,6 +45,7 @@ class MidiPort : public Port {
 	void transport_stopped ();
 	void realtime_locate ();
 	void reset ();
+        void require_resolve ();
 
 	bool input_active() const { return _input_active; }
 	void set_input_active (bool yn);
diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 4b352b3c4d..c6756933aa 100644
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -55,6 +55,7 @@ public:
 
 	size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0, bool stop_on_overflow_in_destination=false);
 	void dump(std::ostream& dst);
+        void flush (framepos_t start, framepos_t end); 
 
 	/** Set the channel filtering mode.
 	 * @param mask If mode is FilterChannels, each bit represents a midi channel:
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index bb810ff74a..934c1862b0 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -92,9 +92,6 @@ public:
 
 	PBD::Signal1<void,bool> StepEditStatusChange;
 
-	bool midi_thru() const { return _midi_thru; }
-	void set_midi_thru (bool yn);
-
 	boost::shared_ptr<SMFSource> write_source (uint32_t n = 0);
 	void set_channel_mode (ChannelMode, uint16_t);
 	ChannelMode get_channel_mode ();
@@ -116,7 +113,7 @@ protected:
 
 	void act_on_mute ();
 
-  private:
+private:
 
 	virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
 	
@@ -131,7 +128,6 @@ protected:
 	MidiRingBuffer<framepos_t> _step_edit_ring_buffer;
 	NoteMode                  _note_mode;
 	bool                      _step_editing;
-	bool                      _midi_thru;
 	bool                      _input_active;
 
 	int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing);
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 15e5f4a9c5..bf91de903b 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -183,6 +183,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent
 	void remove_preset (std::string);
 
 	virtual bool load_preset (PresetRecord);
+	void clear_preset ();
 
 	const PresetRecord * preset_by_label (const std::string &);
 	const PresetRecord * preset_by_uri (const std::string &);
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 1f9e3c1037..37599b0ac6 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -76,6 +76,7 @@ CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ans
 CONFIG_VARIABLE (bool, automation_follows_regions, "automation-follows-regions", true)
 CONFIG_VARIABLE (bool, region_boundaries_from_selected_tracks, "region-boundaries-from-selected-tracks", true)
 CONFIG_VARIABLE (bool, region_boundaries_from_onscreen_tracks, "region-boundaries-from-onscreen_tracks", true)
+CONFIG_VARIABLE (bool, autoscroll_editor, "autoscroll-editor", true)
 
 /* monitoring, mute, solo etc */
 
diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h
index 4ba261f80c..471f172440 100644
--- a/libs/ardour/ardour/region_factory.h
+++ b/libs/ardour/ardour/region_factory.h
@@ -31,6 +31,7 @@
 #include "ardour/types.h"
 
 class XMLNode;
+class RegionNamingTest;
 
 namespace ARDOUR {
 
@@ -119,6 +120,7 @@ public:
 	static void map_add (boost::shared_ptr<Region>);
 
   private:
+	friend class ::RegionNamingTest;
 
 	static void region_changed (PBD::PropertyChange const &, boost::weak_ptr<Region>);
 
@@ -126,10 +128,15 @@ public:
 
 	static RegionMap region_map;
 
-	static Glib::StaticMutex region_name_map_lock;
-
-	static std::map<std::string, uint32_t> region_name_map;
-	static void update_region_name_map (boost::shared_ptr<Region>);
+	static Glib::StaticMutex region_name_maps_mutex;
+	/** map of partial region names and suffix numbers */
+	static std::map<std::string, uint32_t> region_name_number_map;
+	/** map of complete region names with their region ID */
+	static std::map<std::string, PBD::ID> region_name_map;
+	static void add_to_region_name_maps (boost::shared_ptr<Region>);
+	static void rename_in_region_name_maps (boost::shared_ptr<Region>);
+	static void update_region_name_number_map (boost::shared_ptr<Region>);
+	static void remove_from_region_name_map (std::string);
 
 	static PBD::ScopedConnectionList* region_list_connections;
 	static CompoundAssociations _compound_associations;
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 7c3beb6c13..0f318a1b75 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -1293,9 +1293,7 @@ AudioEngine::connect_to_jack (string client_name, string session_uuid)
 {
         EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
         boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
-	jack_options_t options = JackNullOption;
 	jack_status_t status;
-	const char *server_name = NULL;
 
         /* revert all environment settings back to whatever they were when ardour started
          */
@@ -1311,7 +1309,7 @@ AudioEngine::connect_to_jack (string client_name, string session_uuid)
 	    _jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str());
 	else
 #endif
-	    _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
+	_jack = jack_client_open (jack_client_name.c_str(), JackNullOption, &status, 0);
 
 	if (_jack == NULL) {
 		// error message is not useful here
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 50a38b7bad..4c7979dbfc 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -65,6 +65,11 @@ namespace ARDOUR {
 		PBD::PropertyDescriptor<bool> fade_out_is_short;
 		PBD::PropertyDescriptor<bool> fade_in_is_xfade;
 		PBD::PropertyDescriptor<bool> fade_in_is_short;
+		PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
+		PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
+		PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;
+		PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_out;
+		PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > envelope;
 	}
 }
 
@@ -164,6 +169,16 @@ AudioRegion::make_property_quarks ()
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-xfade = %1\n", 	Properties::fade_in_is_xfade.property_id));
 	Properties::fade_in_is_short.property_id = g_quark_from_static_string (X_("fade-in-is-short"));
 	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-short = %1\n", 	Properties::fade_in_is_short.property_id));
+	Properties::fade_in.property_id = g_quark_from_static_string (X_("FadeIn"));
+	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for FadeIn = %1\n",		Properties::fade_in.property_id));
+	Properties::inverse_fade_in.property_id = g_quark_from_static_string (X_("InverseFadeIn"));
+	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for InverseFadeIn = %1\n",	Properties::inverse_fade_in.property_id));
+	Properties::fade_out.property_id = g_quark_from_static_string (X_("FadeOut"));
+	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for FadeOut = %1\n",		Properties::fade_out.property_id));
+	Properties::inverse_fade_out.property_id = g_quark_from_static_string (X_("InverseFadeOut"));
+	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for InverseFadeOut = %1\n",	Properties::inverse_fade_out.property_id));
+	Properties::envelope.property_id = g_quark_from_static_string (X_("Envelope"));
+	DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for Envelope = %1\n",		Properties::envelope.property_id));
 }
 
 void
@@ -181,6 +196,11 @@ AudioRegion::register_properties ()
 	add_property (_fade_out_is_short);
 	add_property (_fade_in_is_xfade);
 	add_property (_fade_in_is_short);
+	add_property (_fade_in);
+	add_property (_inverse_fade_in);
+	add_property (_fade_out);
+	add_property (_inverse_fade_out);
+	add_property (_envelope);
 }
 
 #define AUDIOREGION_STATE_DEFAULT \
@@ -193,7 +213,11 @@ AudioRegion::register_properties ()
 	, _fade_in_is_xfade (Properties::fade_in_is_xfade, false) \
 	, _fade_out_is_xfade (Properties::fade_out_is_xfade, false) \
 	, _fade_in_is_short (Properties::fade_in_is_short, false) \
-	, _fade_out_is_short (Properties::fade_out_is_short, false) 
+	, _fade_out_is_short (Properties::fade_out_is_short, false) \
+	, _fade_in (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \
+	, _inverse_fade_in (Properties::inverse_fade_in, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))) \
+	, _fade_out (Properties::fade_out, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeOutAutomation)))) \
+	, _inverse_fade_out (Properties::inverse_fade_out, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeOutAutomation))))
 
 #define AUDIOREGION_COPY_STATE(other) \
 	_envelope_active (Properties::envelope_active, other->_envelope_active) \
@@ -205,7 +229,11 @@ AudioRegion::register_properties ()
 	, _fade_in_is_xfade (Properties::fade_in_is_xfade, other->_fade_in_is_xfade) \
 	, _fade_out_is_xfade (Properties::fade_out_is_xfade, other->_fade_out_is_xfade) \
 	, _fade_in_is_short (Properties::fade_in_is_short, other->_fade_in_is_short) \
-	, _fade_out_is_short (Properties::fade_out_is_short, other->_fade_out_is_short)
+	, _fade_out_is_short (Properties::fade_out_is_short, other->_fade_out_is_short) \
+	, _fade_in (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_fade_in.val()))) \
+	, _inverse_fade_in (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_inverse_fade_in.val()))) \
+	, _fade_out (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_fade_out.val()))) \
+	, _inverse_fade_out (Properties::fade_in, boost::shared_ptr<AutomationList> (new AutomationList (*other->_inverse_fade_out.val())))
 /* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */
 
 void
@@ -227,12 +255,8 @@ AudioRegion::init ()
 AudioRegion::AudioRegion (Session& s, framepos_t start, framecnt_t len, std::string name)
 	: Region (s, start, len, name, DataType::AUDIO)
 	, AUDIOREGION_STATE_DEFAULT
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter(EnvelopeAutomation))))
 	, _automatable (s)
-	, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation)))
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -244,12 +268,8 @@ AudioRegion::AudioRegion (Session& s, framepos_t start, framecnt_t len, std::str
 AudioRegion::AudioRegion (const SourceList& srcs)
 	: Region (srcs)
 	, AUDIOREGION_STATE_DEFAULT
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter(EnvelopeAutomation))))
 	, _automatable(srcs[0]->session())
-	, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation)))
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -260,15 +280,11 @@ AudioRegion::AudioRegion (const SourceList& srcs)
 AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
 	: Region (other)
 	, AUDIOREGION_COPY_STATE (other)
-	, _automatable (other->session())
-	, _fade_in (new AutomationList (*other->_fade_in))
-	, _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
-	, _fade_out (new AutomationList (*other->_fade_out))
-	, _inverse_fade_out (new AutomationList (*other->_inverse_fade_out))
 	  /* As far as I can see, the _envelope's times are relative to region position, and have nothing
 	     to do with sources (and hence _start).  So when we copy the envelope, we just use the supplied offset.
 	  */
-	, _envelope (new AutomationList (*other->_envelope, 0, other->_length))
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (*other->_envelope.val(), 0, other->_length)))
+	, _automatable (other->session())
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -286,15 +302,11 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
 AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, framecnt_t offset)
 	: Region (other, offset)
 	, AUDIOREGION_COPY_STATE (other)
-	, _automatable (other->session())
-	, _fade_in (new AutomationList (*other->_fade_in))
-	, _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
-	, _fade_out (new AutomationList (*other->_fade_out))
-	, _inverse_fade_out (new AutomationList (*other->_inverse_fade_out))
 	  /* As far as I can see, the _envelope's times are relative to region position, and have nothing
 	     to do with sources (and hence _start).  So when we copy the envelope, we just use the supplied offset.
 	  */
-	, _envelope (new AutomationList (*other->_envelope, offset, other->_length))
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (*other->_envelope.val(), offset, other->_length)))
+	, _automatable (other->session())
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -312,12 +324,8 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, framecnt_t
 AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, const SourceList& srcs)
 	: Region (boost::static_pointer_cast<const Region>(other), srcs)
 	, AUDIOREGION_COPY_STATE (other)
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (*other->_envelope.val())))
 	, _automatable (other->session())
-	, _fade_in (new AutomationList (*other->_fade_in))
-	, _inverse_fade_in (new AutomationList(*other->_inverse_fade_in))
-	, _fade_out (new AutomationList (*other->_fade_out))
-	, _inverse_fade_out (new AutomationList (*other->_inverse_fade_out))
-	, _envelope (new AutomationList (*other->_envelope))
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -335,12 +343,8 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, const Sour
 AudioRegion::AudioRegion (SourceList& srcs)
 	: Region (srcs)
 	, AUDIOREGION_STATE_DEFAULT
+	, _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList(Evoral::Parameter(EnvelopeAutomation))))
 	, _automatable(srcs[0]->session())
-	, _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation)))
-	, _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation)))
-	, _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation)))
 	, _fade_in_suspended (0)
 	, _fade_out_suspended (0)
 {
@@ -756,8 +760,8 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl
 		*/
 
 		if (Config->get_replicate_missing_region_channels()) {
-			/* track is N-channel, this region has less channels, so use a relevant channel
-			 */
+
+			/* copy an existing channel's data in for this non-existant one */
 
 			uint32_t channel = n_channels() % chan_n;
 			boost::shared_ptr<AudioSource> src = boost::dynamic_pointer_cast<AudioSource> (srcs[channel]);
@@ -765,6 +769,11 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl
 			if (src->read (buf, _start + internal_offset, to_read) != to_read) {
 				return 0; /* "read nothing" */
 			}
+
+		} else {
+			
+			/* use silence */
+			memset (buf, 0, sizeof (Sample) * to_read);
 		}
 	}
 
@@ -988,7 +997,7 @@ void
 AudioRegion::set_fade_in (boost::shared_ptr<AutomationList> f)
 {
 	_fade_in->freeze ();
-	*_fade_in = *f;
+	*(_fade_in.val()) = *f;
 	_fade_in->thaw ();
 	_default_fade_in = false;
 
@@ -1010,23 +1019,23 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len)
 	case FadeLinear:
 		_fade_in->fast_simple_add (0.0, 0.0);
 		_fade_in->fast_simple_add (len, 1.0);
-		reverse_curve (_inverse_fade_in, _fade_in);
+		reverse_curve (_inverse_fade_in.val(), _fade_in.val());
 		break;
 
 	case FadeFast:
-		generate_db_fade (_fade_in, len, 10, -60);
-		reverse_curve (c1, _fade_in);
+		generate_db_fade (_fade_in.val(), len, 10, -60);
+		reverse_curve (c1, _fade_in.val());
 		_fade_in->copy_events (*c1);
-		generate_inverse_power_curve (_inverse_fade_in, _fade_in);
+		generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val());
 		break;
 
 	case FadeSlow:
 		generate_db_fade (c1, len, 10, -1);  // start off with a slow fade
 		generate_db_fade (c2, len, 10, -80); // end with a fast fade
-		merge_curves (_fade_in, c1, c2);
-		reverse_curve (c3, _fade_in);
+		merge_curves (_fade_in.val(), c1, c2);
+		reverse_curve (c3, _fade_in.val());
 		_fade_in->copy_events (*c3);
-		generate_inverse_power_curve (_inverse_fade_in, _fade_in);
+		generate_inverse_power_curve (_inverse_fade_in.val(), _fade_in.val());
 		break;
 
 	case FadeConstantPower:
@@ -1035,7 +1044,7 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len)
 			_fade_in->fast_simple_add (len*dist, sin (dist*M_PI/2));
 		}
 		_fade_in->fast_simple_add (len, 1.0);
-		reverse_curve (_inverse_fade_in, _fade_in);
+		reverse_curve (_inverse_fade_in.val(), _fade_in.val());
 		break;
 		
 	case FadeSymmetric:
@@ -1053,9 +1062,9 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len)
 			_fade_in->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff);
 		}
 		_fade_in->fast_simple_add (len, VERY_SMALL_SIGNAL);
-		reverse_curve (c3, _fade_in);
+		reverse_curve (c3, _fade_in.val());
 		_fade_in->copy_events (*c3);
-		reverse_curve (_inverse_fade_in, _fade_in );
+		reverse_curve (_inverse_fade_in.val(), _fade_in.val());
 		break;
 	}
 
@@ -1068,7 +1077,7 @@ void
 AudioRegion::set_fade_out (boost::shared_ptr<AutomationList> f)
 {
 	_fade_out->freeze ();
-	*_fade_out = *f;
+	*(_fade_out.val()) = *f;
 	_fade_out->thaw ();
 	_default_fade_out = false;
 
@@ -1089,19 +1098,19 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
 	case FadeLinear:
 		_fade_out->fast_simple_add (0.0, 1.0);
 		_fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL);
-		reverse_curve (_inverse_fade_out, _fade_out);
+		reverse_curve (_inverse_fade_out.val(), _fade_out.val());
 		break;
 		
 	case FadeFast: 
-		generate_db_fade (_fade_out, len, 10, -60);
-		generate_inverse_power_curve (_inverse_fade_out, _fade_out);
+		generate_db_fade (_fade_out.val(), len, 10, -60);
+		generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val());
 		break;
 		
 	case FadeSlow: 
 		generate_db_fade (c1, len, 10, -1);  //start off with a slow fade
 		generate_db_fade (c2, len, 10, -80);  //end with a fast fade
-		merge_curves (_fade_out, c1, c2);
-		generate_inverse_power_curve (_inverse_fade_out, _fade_out);
+		merge_curves (_fade_out.val(), c1, c2);
+		generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val());
 		break;
 
 	case FadeConstantPower:
@@ -1113,7 +1122,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
 			_fade_out->fast_simple_add ((len * dist), cos(dist*M_PI/2));
 		}
 		_fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL);
-		reverse_curve (_inverse_fade_out, _fade_out);
+		reverse_curve (_inverse_fade_out.val(), _fade_out.val());
 		break;
 		
 	case FadeSymmetric:
@@ -1132,7 +1141,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len)
 			_fade_out->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff);
 		}
 		_fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL);
-		reverse_curve (_inverse_fade_out, _fade_out);
+		reverse_curve (_inverse_fade_out.val(), _fade_out.val());
 		break;
 	}
 
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 54d838f6e2..26ca7b097a 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -510,3 +510,24 @@ AutomationList::set_state (const XMLNode& node, int version)
 	return 0;
 }
 
+bool
+AutomationList::operator!= (AutomationList const & other) const
+{
+	return (
+		static_cast<ControlList const &> (*this) != static_cast<ControlList const &> (other) ||
+		_state != other._state ||
+		_style != other._style ||
+		_touching != other._touching
+		);
+}
+
+PBD::PropertyBase *
+AutomationListProperty::clone () const
+{
+	return new AutomationListProperty (
+		this->property_id(),
+		boost::shared_ptr<AutomationList> (new AutomationList (*this->_old.get())),
+		boost::shared_ptr<AutomationList> (new AutomationList (*this->_current.get()))
+		);
+}
+	
diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index a8a684a4aa..760b16c409 100644
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -124,7 +124,6 @@ ardour_config_search_path ()
 		
 		search_path = sp;
 		have_path = true;
-		info << "CONFIG PATH: " << search_path.to_string() << endmsg;
 	}
 
 	return search_path;
@@ -153,7 +152,6 @@ ardour_data_search_path ()
 		
 		search_path = sp;
 		have_path = true;
-		info << "DATA PATH: " << search_path.to_string() << endmsg;
 	}
 
 	return search_path;
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 361b682fcb..385d956b4c 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -116,34 +116,6 @@ extern void setup_enum_writer ();
 */
 PBD::PropertyChange ARDOUR::bounds_change;
 
-namespace ARDOUR {
-	namespace Properties {
-
-		/* the envelope and fades are not scalar items and so
-		   currently (2010/02) are not stored using Property.
-		   However, these descriptors enable us to notify
-		   about changes to them via PropertyChange.
-
-		   Declared in ardour/audioregion.h ...
-		*/
-
-		PBD::PropertyDescriptor<bool> fade_in;
-		PBD::PropertyDescriptor<bool> fade_out;
-		PBD::PropertyDescriptor<bool> envelope;
-	}
-}
-
-void
-ARDOUR::make_property_quarks ()
-{
-	Properties::fade_in.property_id = g_quark_from_static_string (X_("fade_in_FAKE"));
-        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade_in_FAKE = %1\n", 	Properties::fade_in.property_id));
-	Properties::fade_out.property_id = g_quark_from_static_string (X_("fade_out_FAKE"));
-        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade_out_FAKE = %1\n", 	Properties::fade_out.property_id));
-	Properties::envelope.property_id = g_quark_from_static_string (X_("envelope_FAKE"));
-        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for envelope_FAKE = %1\n", 	Properties::envelope.property_id));
-}
-
 void
 setup_hardware_optimization (bool try_optimization)
 {
@@ -249,7 +221,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization)
 	PBD::ID::init ();
 	SessionEvent::init_event_pool ();
 
-	make_property_quarks ();
 	SessionObject::make_property_quarks ();
 	Region::make_property_quarks ();
 	MidiRegion::make_property_quarks ();
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 6c8fb3c9db..f8a41c5ecd 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -835,7 +835,6 @@ LV2Plugin::find_presets()
 bool
 LV2Plugin::load_preset(PresetRecord r)
 {
-	Plugin::load_preset(r);
 
 	std::map<std::string,uint32_t>::iterator it;
 
@@ -862,18 +861,97 @@ LV2Plugin::load_preset(PresetRecord r)
 	lilv_node_free(lv2_symbol);
 	lilv_node_free(lv2_port);
 
+	Plugin::load_preset(r);
+
 	return true;
 }
 
-std::string
-LV2Plugin::do_save_preset(string /*name*/)
+const void*
+ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
+                                 void*       user_data,
+                                 uint32_t*   size,
+                                 uint32_t*   type)
 {
-	return "";
+	// cerr << "get_port_value(" << port_symbol << ", ...) ... ";
+	LV2Plugin *plugin = (LV2Plugin *) user_data;
+
+	uint32_t index = plugin->port_index(port_symbol);
+	if (index != (uint32_t) -1) {
+		if (plugin->parameter_is_input(index) && plugin->parameter_is_control(index)) {
+			float *value;
+			*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;
+}
+
+
+std::string
+LV2Plugin::do_save_preset(string name)
+{
+	// cerr << "LV2Plugin::do_save_preset(" << name << ")" << endl;
+
+	string pset_uri = uri();
+	pset_uri += "#";
+	pset_uri += name;
+
+	string save_dir = Glib::build_filename(
+		Glib::get_home_dir(), 
+		Glib::build_filename(".lv2", "presets") 
+	);
+
+	LilvState* state = lilv_state_new_from_instance(
+		_impl->plugin,
+		_impl->instance,
+		_uri_map.urid_map(),
+		scratch_dir().c_str(),			// file_dir
+		NULL, 					// copy_dir
+		NULL, 					// link_dir
+		save_dir.c_str(),			// save_dir
+		lv2plugin_get_port_value,		// get_value
+		(void*) this,				// user_data
+		LV2_STATE_IS_POD|LV2_STATE_IS_PORTABLE,	// flags
+		_features				// features
+	);
+
+	lilv_state_set_label(state, name.c_str());
+	lilv_state_save(
+		_world.world,		// world
+		_uri_map.urid_map(),	// map
+		_uri_map.urid_unmap(),	// unmap
+		state,			// state
+		pset_uri.c_str(),	// uri
+		save_dir.c_str(),	// dir
+		(name + ".ttl").c_str()	// filename
+
+	);
+
+	lilv_state_free(state);
+	return pset_uri;
 }
 
 void
-LV2Plugin::do_remove_preset(string /*name*/)
-{}
+LV2Plugin::do_remove_preset(string name)
+{
+	string preset_file = Glib::build_filename(
+		Glib::get_home_dir(), 
+		Glib::build_filename(
+			Glib::build_filename(".lv2", "presets"),
+			name + ".ttl"
+		)
+	);
+	unlink(preset_file.c_str());
+
+}
 
 bool
 LV2Plugin::has_editor() const
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index a8757d7575..5e2a6e23b9 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -506,6 +506,14 @@ MidiDiskstream::seek (framepos_t frame, bool complete_refill)
 	Glib::Mutex::Lock lm (state_lock);
 	int ret = -1;
 
+	if (g_atomic_int_get (&_frames_read_from_ringbuffer) == 0) {
+		/* we haven't read anything since the last seek,
+		   so flush all note trackers to prevent
+		   wierdness
+		*/
+		reset_tracker ();
+	}
+
 	_playback_buf->reset();
 	_capture_buf->reset();
 	g_atomic_int_set(&_frames_read_from_ringbuffer, 0);
@@ -1269,6 +1277,13 @@ MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/)
 	return 0;
 }
 
+void
+MidiDiskstream::flush_playback (framepos_t start, framepos_t end)
+{
+	_playback_buf->flush (start, end);
+	g_atomic_int_add (&_frames_read_from_ringbuffer, end - start);
+}
+
 /** Writes playback events from playback_sample for nframes to dst, translating time stamps
  *  so that an event at playback_sample has time = 0
  */
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 9a7d3eeb27..63004f658b 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -188,6 +188,12 @@ MidiPort::flush_buffers (pframes_t nframes)
 	}
 }
 
+void
+MidiPort::require_resolve ()
+{
+	_resolve_required = true;
+}
+
 void
 MidiPort::transport_stopped ()
 {
diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc
index 30f42aba19..786ed3c080 100644
--- a/libs/ardour/midi_ring_buffer.cc
+++ b/libs/ardour/midi_ring_buffer.cc
@@ -98,7 +98,9 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
 			break;
 		} else if (ev_time + loop_offset < start) {
 			DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start));
-			break;
+			this->increment_read_ptr (prefix_size);
+			this->increment_read_ptr (ev_size);
+			continue;
 		} else {
 			DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end));
 		}
@@ -193,6 +195,36 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
 	return count;
 }
 
+template<typename T>
+void
+MidiRingBuffer<T>::flush (framepos_t start, framepos_t end)
+{
+	const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t);
+
+	while (this->read_space() >= prefix_size) {
+		uint8_t  peekbuf[prefix_size];
+		bool     success;
+		uint32_t ev_size;
+		T        ev_time;
+
+		success = this->peek (peekbuf, prefix_size);
+		/* this cannot fail, because we've already verified that there
+		   is prefix_space to read
+		*/
+		assert (success);
+
+		ev_time = *((T*) peekbuf);
+		
+		if (ev_time >= end) {
+			break;
+		}
+
+		ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)));
+		this->increment_read_ptr (prefix_size);
+		this->increment_read_ptr (ev_size);
+	}
+}
+
 template<typename T>
 void
 MidiRingBuffer<T>::dump(ostream& str)
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 64e61e79f9..a8a0e218a6 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -54,7 +54,6 @@ MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mo
 	, _step_edit_ring_buffer(64) // FIXME: size?
 	, _note_mode(Sustained)
 	, _step_editing (false)
-	, _midi_thru (true)
 	, _input_active (true)
 {
 }
@@ -155,10 +154,6 @@ MidiTrack::set_state (const XMLNode& node, int version)
 	// No destructive MIDI tracks (yet?)
 	_mode = Normal;
 
-	if ((prop = node.property ("midi-thru")) != 0) {
-		set_midi_thru (string_is_affirmative (prop->value()));
-	}
-
 	if ((prop = node.property ("input-active")) != 0) {
 		set_input_active (string_is_affirmative (prop->value()));
 	}
@@ -205,7 +200,6 @@ MidiTrack::state(bool full_state)
 
 	root.add_property ("step-editing", (_step_editing ? "yes" : "no"));
 	root.add_property ("note-mode", enum_2_string (_note_mode));
-	root.add_property ("midi-thru", (_midi_thru ? "yes" : "no"));
 	root.add_property ("input-active", (_input_active ? "yes" : "no"));
 
 	return root;
@@ -315,6 +309,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 		return dret;
 	}
 
+
 	_silent = false;
 
 	if ((dret = diskstream->process (transport_frame, nframes, playback_distance)) != 0) {
@@ -335,9 +330,18 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 		   at least potentially (depending on monitoring options)
 		*/
 
+		/* because the playback buffer is event based and not a
+		 * continuous stream, we need to make sure that we empty
+		 * it of events every cycle to avoid it filling up with events
+		 * read from disk, while we are actually monitoring input
+		 */
+
+		diskstream->flush_playback (start_frame, end_frame);
+
 		passthru (start_frame, end_frame, nframes, 0);
 
 	} else {
+
 		/*
 		   XXX is it true that the earlier test on n_outputs()
 		   means that we can avoid checking it again here? i think
@@ -349,7 +353,6 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 
 		/* copy the diskstream data to all output buffers */
 
-		//const size_t limit = n_process_buffers().n_audio();
 		BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
 		MidiBuffer& mbuf (bufs.get_midi (0));
 
@@ -477,11 +480,6 @@ MidiTrack::write_out_of_band_data (BufferSet& bufs, framepos_t /*start*/, framep
 
 		_immediate_events.read (buf, 0, 1, nframes-1, true);
 	}
-
-	// MIDI thru: send incoming data "through" output
-	if (_midi_thru && _session.transport_speed() != 0.0f && _input->n_ports().n_midi()) {
-		buf.merge_in_place (_input->midi(0)->get_midi_buffer(nframes));
-	}
 }
 
 int
@@ -625,12 +623,6 @@ MidiTrack::set_step_editing (bool yn)
 	}
 }
 
-void
-MidiTrack::set_midi_thru (bool yn)
-{
-	_midi_thru = yn;
-}
-
 boost::shared_ptr<SMFSource>
 MidiTrack::write_source (uint32_t)
 {
@@ -752,12 +744,28 @@ MidiTrack::act_on_mute ()
 void
 MidiTrack::set_monitoring (MonitorChoice mc)
 {
-	Track::set_monitoring (mc);
+	if (mc != _monitoring) {
 
-	boost::shared_ptr<MidiDiskstream> md (midi_diskstream());
+		Track::set_monitoring (mc);
+		
+		/* monitoring state changed, so flush out any on notes at the
+		 * port level.
+		 */
 
-	if (md) {
-		md->reset_tracker ();
+		PortSet& ports (_output->ports());
+		
+		for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) {
+			boost::shared_ptr<MidiPort> mp = boost::dynamic_pointer_cast<MidiPort> (*p);
+			if (mp) {
+				mp->require_resolve ();
+			}
+		}
+
+		boost::shared_ptr<MidiDiskstream> md (midi_diskstream());
+		
+		if (md) {
+			md->reset_tracker ();
+		}
 	}
 }
 
diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index cf148f08fa..691a8f31ee 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -26,6 +26,7 @@
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
 
+#include "ardour/debug.h"
 #include "ardour/panner_manager.h"
 #include "ardour/panner_search_path.h"
 
@@ -72,7 +73,7 @@ PannerManager::discover_panners ()
 	find_matching_files_in_search_path (panner_search_path (),
 	                                    dylib_extension_pattern, panner_modules);
 
-	info << string_compose (_("looking for panners in %1"), panner_search_path().to_string()) << endmsg;
+	DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1"), panner_search_path().to_string()));
 
 	for (vector<sys::path>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
 		panner_discover ((*i).to_string());
@@ -95,7 +96,7 @@ PannerManager::panner_discover (string path)
 
 		if (i == panner_info.end()) {
 			panner_info.push_back (pinfo);
-			info << string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path) << endmsg;
+			DEBUG_TRACE (DEBUG::Panning, string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path));
 		}
 	}
 
diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 4afc39b4ec..8cdbf98b89 100644
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -327,6 +327,16 @@ Plugin::load_preset (PresetRecord r)
 	return true;
 }
 
+void
+Plugin::clear_preset ()
+{
+	_last_preset.uri = "";
+	_last_preset.label = "";
+	_parameter_changed_since_last_preset = false;
+
+	PresetLoaded (); /* EMIT SIGNAL */
+}
+
 /** @param val `plugin' value */
 void
 Plugin::set_parameter (uint32_t which, float val)
diff --git a/libs/ardour/process_thread.cc b/libs/ardour/process_thread.cc
index ae7466c7f0..5d3b54cb13 100644
--- a/libs/ardour/process_thread.cc
+++ b/libs/ardour/process_thread.cc
@@ -40,7 +40,9 @@ release_thread_buffer (void* arg)
 void
 ProcessThread::init ()
 {
-        _private_thread_buffers = new Private<ThreadBuffers> (release_thread_buffer);
+	if (_private_thread_buffers == 0) {
+		_private_thread_buffers = new Private<ThreadBuffers> (release_thread_buffer);
+	}
 }
 
 ProcessThread::ProcessThread ()
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index fa948844ab..ddc0451523 100644
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -39,8 +39,9 @@ PBD::Signal1<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion;
 Glib::StaticMutex                             RegionFactory::region_map_lock;
 RegionFactory::RegionMap                      RegionFactory::region_map;
 PBD::ScopedConnectionList*                    RegionFactory::region_list_connections = 0;
-Glib::StaticMutex                             RegionFactory::region_name_map_lock;
-std::map<std::string, uint32_t>               RegionFactory::region_name_map;
+Glib::StaticMutex                             RegionFactory::region_name_maps_mutex;
+std::map<std::string, uint32_t>               RegionFactory::region_name_number_map;
+std::map<std::string, PBD::ID>                RegionFactory::region_name_map;
 RegionFactory::CompoundAssociations           RegionFactory::_compound_associations;
 
 boost::shared_ptr<Region>
@@ -320,7 +321,7 @@ RegionFactory::map_add (boost::shared_ptr<Region> r)
 	r->DropReferences.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::map_remove, boost::weak_ptr<Region> (r)));
 	r->PropertyChanged.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr<Region> (r)));
 
-	update_region_name_map (r);
+	add_to_region_name_maps (r);
 }
 
 void
@@ -335,6 +336,7 @@ RegionFactory::map_remove (boost::weak_ptr<Region> w)
 	RegionMap::iterator i = region_map.find (r->id());
 
 	if (i != region_map.end()) {
+		remove_from_region_name_map (i->second->name ());
 		region_map.erase (i);
 	}
 }
@@ -384,6 +386,7 @@ RegionFactory::clear_map ()
 		Glib::Mutex::Lock lm (region_map_lock);
 		region_map.clear ();
 		_compound_associations.clear ();
+		region_name_map.clear ();
 	}
 }
 
@@ -418,8 +421,49 @@ RegionFactory::nregions ()
 	return region_map.size ();
 }
 
+/** Add a region to the two region name maps */
 void
-RegionFactory::update_region_name_map (boost::shared_ptr<Region> region)
+RegionFactory::add_to_region_name_maps (boost::shared_ptr<Region> region)
+{
+	update_region_name_number_map (region);
+
+	Glib::Mutex::Lock lm (region_name_maps_mutex);
+	region_name_map[region->name()] = region->id ();
+}
+
+/** Account for a region rename in the two region name maps */
+void
+RegionFactory::rename_in_region_name_maps (boost::shared_ptr<Region> region)
+{
+	update_region_name_number_map (region);
+
+	Glib::Mutex::Lock lm (region_name_maps_mutex);
+	
+	map<string, PBD::ID>::iterator i = region_name_map.begin();
+	while (i != region_name_map.end() && i->second != region->id ()) {
+		++i;
+	}
+
+	/* Erase the entry for the old name and put in a new one */
+	if (i != region_name_map.end()) {
+		region_name_map.erase (i);
+		region_name_map[region->name()] = region->id ();
+	}
+}
+
+/** Remove a region's details from the region_name_map */
+void
+RegionFactory::remove_from_region_name_map (string n)
+{
+	map<string, PBD::ID>::iterator i = region_name_map.find (n);
+	if (i != region_name_map.end ()) {
+		region_name_map.erase (i);
+	}
+}
+
+/** Update a region's entry in the region_name_number_map */
+void
+RegionFactory::update_region_name_number_map (boost::shared_ptr<Region> region)
 {
 	string::size_type const last_period = region->name().find_last_of ('.');
 
@@ -432,8 +476,8 @@ RegionFactory::update_region_name_map (boost::shared_ptr<Region> region)
 		   which is just fine
 		*/
 
-		Glib::Mutex::Lock lm (region_name_map_lock);
-		region_name_map[base] = atoi (number.c_str ());
+		Glib::Mutex::Lock lm (region_name_maps_mutex);
+		region_name_number_map[base] = atoi (number.c_str ());
 	}
 }
 
@@ -446,7 +490,7 @@ RegionFactory::region_changed (PropertyChange const & what_changed, boost::weak_
 	}
 
 	if (what_changed.contains (Properties::name)) {
-		update_region_name_map (r);
+		rename_in_region_name_maps (r);
 	}
 }
 
@@ -482,15 +526,15 @@ RegionFactory::region_name (string& result, string base, bool newlevel)
 		}
 
 		{
-			Glib::Mutex::Lock lm (region_name_map_lock);
+			Glib::Mutex::Lock lm (region_name_maps_mutex);
 
 			map<string,uint32_t>::iterator x;
 
 			result = subbase;
 
-			if ((x = region_name_map.find (subbase)) == region_name_map.end()) {
+			if ((x = region_name_number_map.find (subbase)) == region_name_number_map.end()) {
 				result += ".1";
-				region_name_map[subbase] = 1;
+				region_name_number_map[subbase] = 1;
 			} else {
 				x->second++;
 				snprintf (buf, sizeof (buf), ".%d", x->second);
@@ -555,8 +599,6 @@ RegionFactory::new_region_name (string old)
 
 	while (number < (UINT_MAX-1)) {
 
-		const RegionMap& regions (RegionFactory::regions());
-		RegionMap::const_iterator i;
 		string sbuf;
 
 		number++;
@@ -564,13 +606,7 @@ RegionFactory::new_region_name (string old)
 		snprintf (buf, len, "%s%" PRIu32 "%s", old.substr (0, last_period + 1).c_str(), number, remainder.c_str());
 		sbuf = buf;
 
-		for (i = regions.begin(); i != regions.end(); ++i) {
-			if (i->second->name() == sbuf) {
-				break;
-			}
-		}
-
-		if (i == regions.end()) {
+		if (region_name_map.find (sbuf) == region_name_map.end ()) {
 			break;
 		}
 	}
@@ -607,6 +643,7 @@ RegionFactory::remove_regions_using_source (boost::shared_ptr<Source> src)
 		++j;
 		
 		if (i->second->uses_source (src)) {
+			remove_from_region_name_map (i->second->name ());
 			region_map.erase (i);
                 }
 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 318524d8ed..28cefd5ae5 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -26,6 +26,8 @@
 #include <cassert>
 #include <algorithm>
 
+#include <boost/algorithm/string.hpp>
+
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
 #include "pbd/memento_command.h"
@@ -2127,6 +2129,8 @@ Route::set_state (const XMLNode& node, int version)
 		} else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) {
 			if (prop->value() == "solo") {
 				_solo_control->set_state (*child, version);
+			} else if (prop->value() == "mute") {
+				_mute_control->set_state (*child, version);
 			}
 
 		} else if (child->name() == X_("RemoteControl")) {
@@ -2164,7 +2168,9 @@ Route::set_state_2X (const XMLNode& node, int version)
 	}
 
 	if ((prop = node.property (X_("flags"))) != 0) {
-		_flags = Flag (string_2_enum (prop->value(), _flags));
+		string f = prop->value ();
+		boost::replace_all (f, "ControlOut", "MonitorOut");
+		_flags = Flag (string_2_enum (f, _flags));
 	} else {
 		_flags = Flag (0);
 	}
diff --git a/libs/ardour/run-profiling.sh b/libs/ardour/run-profiling.sh
index 3f2148fbed..30daac9e6e 100644
--- a/libs/ardour/run-profiling.sh
+++ b/libs/ardour/run-profiling.sh
@@ -8,24 +8,43 @@ if [ ! -f './tempo.cc' ]; then
     exit 1;
 fi
 
-srcdir=`pwd`
-cd ../../build
+if [ "$1" == "" ]; then
+   echo "Syntax: run-profiling.sh [flag] <test> [<args>]"
+   exit 1;
+fi
+
+cd ../..
+top=`pwd`
+cd build
 
 libs='libs'
 
 export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH
 
+export ARDOUR_CONFIG_PATH=$top:$top/gtk2_ardour:$libs/..:$libs/../gtk2_ardour
 export ARDOUR_PANNER_PATH=$libs/panners/2in2out:$libs/panners/1in2out:$libs/panners/vbap
+export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
+export ARDOUR_MCP_PATH="../mcp"
+export ARDOUR_DLL_PATH=$libs
+export ARDOUR_DATA_PATH=$top/gtk2_ardour:$top/build/gtk2_ardour:.
 
 export LD_PRELOAD=/home/carl/src/libfakejack/libjack.so
-session='32tracks'
+# session='32tracks'
 
-if [ "$1" == "--debug" ]; then
-        gdb --args ./libs/ardour/run-profiling $session
-elif [ "$1" == "--valgrind" ]; then
-        valgrind ./libs/ardour/run-profiling $session
-elif [ "$1" == "--callgrind" ]; then
-        valgrind --tool=callgrind ./libs/ardour/run-profiling $session
-else
-        ./libs/ardour/run-profiling $session
+p=$1
+if [ "$p" == "--debug" -o "$p" == "--valgrind" -o "$p" == "--callgrind" ]; then
+  f=$p
+  p=$2
+  shift 1
+fi
+shift 1
+
+if [ "$f" == "--debug" ]; then
+        gdb --args ./libs/ardour/$p $*
+elif [ "$f" == "--valgrind" ]; then
+        valgrind ./libs/ardour/$p $*
+elif [ "$f" == "--callgrind" ]; then
+        valgrind --tool=callgrind ./libs/ardour/$p $*
+else
+        ./libs/ardour/$p $*
 fi
diff --git a/libs/ardour/run-session-tests.sh b/libs/ardour/run-session-tests.sh
new file mode 100644
index 0000000000..63218d8887
--- /dev/null
+++ b/libs/ardour/run-session-tests.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# Run simple session load tester over a corpus of sessions.
+#
+
+if [ ! -f './tempo.cc' ]; then
+    echo "This script must be run from within the libs/ardour directory";
+    exit 1;
+fi
+
+cd ../..
+top=`pwd`
+cd build
+
+libs='libs'
+
+export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH
+
+export ARDOUR_CONFIG_PATH=$top:$top/gtk2_ardour:$libs/..:$libs/../gtk2_ardour
+export ARDOUR_PANNER_PATH=$libs/panners/2in2out:$libs/panners/1in2out:$libs/panners/vbap
+export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
+export ARDOUR_MCP_PATH="../mcp"
+export ARDOUR_DLL_PATH=$libs
+export ARDOUR_DATA_PATH=$top/gtk2_ardour:$top/build/gtk2_ardour:.
+
+f=""
+if [ "$1" == "--debug" -o "$1" == "--valgrind" ]; then
+  f=$1
+  shift 1
+fi
+
+d=$1
+if [ "$d" == "" ]; then
+  echo "Syntax: run-session-tests.sh <corpus>"
+  exit 1
+fi
+
+for s in `find $d -mindepth 1 -maxdepth 1 -type d`; do
+  n=`basename $s`
+  if [ "$f" == "--debug" ]; then
+    gdb --args ./libs/ardour/load-session $s $n
+  elif [ "$f" == "--valgrind" ]; then
+    valgrind ./libs/ardour/load-session $s $n
+  else
+    ./libs/ardour/load-session $s $n
+  fi
+done
+
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9e46f38f6a..72c2a8654f 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -125,7 +125,7 @@ PBD::Signal0<void> Session::SuccessfulGraphSort;
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
 
-/** @param snapshot_name Snapshot name, without .ardour prefix */
+/** @param snapshot_name Snapshot name, without .ardour suffix */
 Session::Session (AudioEngine &eng,
                   const string& fullpath,
                   const string& snapshot_name,
@@ -248,6 +248,8 @@ Session::destroy ()
 
 	_butler->drop_references ();
 	delete _butler;
+	_butler = 0;
+	
 	delete midi_control_ui;
 	delete _all_route_group;
 
@@ -1483,7 +1485,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
 			trace_terminal (*i, *i);
 		}
 
-		r = sorted_routes;
+		*r = *sorted_routes;
 
 #ifndef NDEBUG
 		DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 30f8571c01..347c4ee35b 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -675,7 +675,7 @@ Session::rename_state (string old_name, string new_name)
 void
 Session::remove_state (string snapshot_name)
 {
-	if (snapshot_name == _current_snapshot_name || snapshot_name == _name) {
+	if (!_writable || snapshot_name == _current_snapshot_name || snapshot_name == _name) {
 		// refuse to remove the current snapshot or the "main" one
 		return;
 	}
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 5fef402d9f..7c23e2aee7 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1476,9 +1476,11 @@ Session::engine_halted ()
 	   the picture.
 	*/
 
-	g_atomic_int_set (&_butler->should_do_transport_work, 0);
-	set_post_transport_work (PostTransportWork (0));
-	_butler->stop ();
+	if (_butler) {
+		g_atomic_int_set (&_butler->should_do_transport_work, 0);
+		set_post_transport_work (PostTransportWork (0));
+		_butler->stop ();
+	}
 
 	realtime_stop (false, true);
 	non_realtime_stop (false, 0, ignored);
diff --git a/libs/ardour/test/automation_list_property_test.cc b/libs/ardour/test/automation_list_property_test.cc
new file mode 100644
index 0000000000..90e2e22989
--- /dev/null
+++ b/libs/ardour/test/automation_list_property_test.cc
@@ -0,0 +1,129 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "pbd/properties.h"
+#include "pbd/stateful_diff_command.h"
+#include "ardour/automation_list.h"
+#include "automation_list_property_test.h"
+#include "test_util.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION (AutomationListPropertyTest);
+
+using namespace std;
+using namespace PBD;
+using namespace ARDOUR;
+
+void
+AutomationListPropertyTest::basicTest ()
+{
+	list<string> ignore_properties;
+	ignore_properties.push_back ("id");
+
+	PropertyDescriptor<boost::shared_ptr<AutomationList> > descriptor;
+	descriptor.property_id = g_quark_from_static_string ("FadeIn");
+	AutomationListProperty property (
+		descriptor,
+		boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))
+		);
+
+	property.clear_changes ();
+
+	/* No change since we just cleared them */
+	CPPUNIT_ASSERT_EQUAL (false, property.changed());
+	
+	property->add (1, 2);
+	property->add (3, 4);
+
+	/* Now it has changed */
+	CPPUNIT_ASSERT_EQUAL (true, property.changed());
+
+	XMLNode* foo = new XMLNode ("test");
+	property.get_changes_as_xml (foo);
+	check_xml (foo, "../libs/ardour/test/data/automation_list_property_test1.ref", ignore_properties);
+
+	/* Do some more */
+	property.clear_changes ();
+	CPPUNIT_ASSERT_EQUAL (false, property.changed());
+	property->add (5, 6);
+	property->add (7, 8);
+	CPPUNIT_ASSERT_EQUAL (true, property.changed());
+	foo = new XMLNode ("test");
+	property.get_changes_as_xml (foo);
+	check_xml (foo, "../libs/ardour/test/data/automation_list_property_test2.ref", ignore_properties);
+}
+
+/** Here's a StatefulDestructible class that has a AutomationListProperty */
+class Fred : public StatefulDestructible
+{
+public:
+	Fred ()
+		: _jim (_descriptor, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation))))
+
+	{
+		add_property (_jim);
+	}
+
+	XMLNode & get_state () {
+		XMLNode* n = new XMLNode ("State");
+		add_properties (*n);
+		return *n;
+	}
+
+	int set_state (XMLNode const & node, int) {
+		set_values (node);
+		return 0;
+	}
+
+	static void make_property_quarks () {
+		_descriptor.property_id = g_quark_from_static_string ("FadeIn");
+	}
+
+	AutomationListProperty _jim;
+	static PropertyDescriptor<boost::shared_ptr<AutomationList> > _descriptor;
+};
+
+PropertyDescriptor<boost::shared_ptr<AutomationList> > Fred::_descriptor;
+
+void
+AutomationListPropertyTest::undoTest ()
+{
+	list<string> ignore_properties;
+	ignore_properties.push_back ("id");
+
+	Fred::make_property_quarks ();
+
+	boost::shared_ptr<Fred> sheila (new Fred);
+
+	/* Add some data */
+	sheila->_jim->add (1, 2);
+	sheila->_jim->add (3, 4);
+
+	/* Do a `command' */
+	sheila->clear_changes ();
+	sheila->_jim->add (5, 6);
+	sheila->_jim->add (7, 8);
+	StatefulDiffCommand sdc (sheila);
+
+	/* Undo */
+	sdc.undo ();
+	check_xml (&sheila->get_state(), "../libs/ardour/test/data/automation_list_property_test3.ref", ignore_properties);
+
+	/* Redo */
+	sdc.redo ();
+	check_xml (&sheila->get_state(), "../libs/ardour/test/data/automation_list_property_test4.ref", ignore_properties);
+}
diff --git a/libs/ardour/test/automation_list_property_test.h b/libs/ardour/test/automation_list_property_test.h
new file mode 100644
index 0000000000..8885d23242
--- /dev/null
+++ b/libs/ardour/test/automation_list_property_test.h
@@ -0,0 +1,32 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+class AutomationListPropertyTest : public CppUnit::TestFixture
+{
+	CPPUNIT_TEST_SUITE (AutomationListPropertyTest);
+	CPPUNIT_TEST (basicTest);
+	CPPUNIT_TEST (undoTest);
+	CPPUNIT_TEST_SUITE_END ();
+
+public:
+	void basicTest ();
+	void undoTest ();
+};
diff --git a/libs/ardour/test/combine_regions_test.cc b/libs/ardour/test/combine_regions_test.cc
index 7c4d5f0e68..385a6e852f 100644
--- a/libs/ardour/test/combine_regions_test.cc
+++ b/libs/ardour/test/combine_regions_test.cc
@@ -76,8 +76,6 @@ CombineRegionsTest::check_crossfade1 ()
 		r0 *= fade_out[i - 128];
 		
 		float const r1 = (i - 128) * fade_in[i - 128];
-		cout << setprecision(12);
-		cout << "\t\ti=" << i << " fade_out=" << fade_out[i - 128] << " r1=" << r1 << " r0=" << r0 << "\n";
 		CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16);
 	}
 
@@ -180,8 +178,6 @@ CombineRegionsTest::check_crossfade2 ()
 		float r1 = (i - 128) * region_fade_in;
 		r1 *= fade_in[i - 128];
 		
-		cout << setprecision(12);
-		cout << "\t\ti=" << i << " fade_out=" << fade_out[i - 128] << " r1=" << r1 << " r0=" << r0 << "\n";
 		CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16);
 	}
 
@@ -203,8 +199,6 @@ CombineRegionsTest::check_crossfade2 ()
 void
 CombineRegionsTest::crossfadeTest2 ()
 {
-	cout << "\n\n\nCOMBINE\n";
-
 	/* Two regions, both 256 frames in length, overlapping by 128 frames in the middle */
 
 	_ar[0]->set_default_fade_in ();
@@ -231,7 +225,6 @@ CombineRegionsTest::crossfadeTest2 ()
 	CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade ());
 
 	/* Check that the read comes back correctly */
-	cout << "\n\n\nFIRST READ\n";
 	check_crossfade2 ();
 
 	/* Combine the two regions */
diff --git a/libs/ardour/test/data/automation_list_property_test1.ref b/libs/ardour/test/data/automation_list_property_test1.ref
new file mode 100644
index 0000000000..36e8389bf5
--- /dev/null
+++ b/libs/ardour/test/data/automation_list_property_test1.ref
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test>
+  <FadeIn>
+    <from>
+      <AutomationList automation-id="fadein" id="164" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute"/>
+    </from>
+    <to>
+      <AutomationList automation-id="fadein" id="163" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute">
+        <events>1 2
+3 4
+</events>
+      </AutomationList>
+    </to>
+  </FadeIn>
+</test>
diff --git a/libs/ardour/test/data/automation_list_property_test2.ref b/libs/ardour/test/data/automation_list_property_test2.ref
new file mode 100644
index 0000000000..cacfe510aa
--- /dev/null
+++ b/libs/ardour/test/data/automation_list_property_test2.ref
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test>
+  <FadeIn>
+    <from>
+      <AutomationList automation-id="fadein" id="165" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute">
+        <events>1 2
+3 4
+</events>
+      </AutomationList>
+    </from>
+    <to>
+      <AutomationList automation-id="fadein" id="163" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute">
+        <events>1 2
+3 4
+5 6
+7 8
+</events>
+      </AutomationList>
+    </to>
+  </FadeIn>
+</test>
diff --git a/libs/ardour/test/data/automation_list_property_test3.ref b/libs/ardour/test/data/automation_list_property_test3.ref
new file mode 100644
index 0000000000..e5e6117d69
--- /dev/null
+++ b/libs/ardour/test/data/automation_list_property_test3.ref
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<State>
+  <FadeIn>
+    <AutomationList automation-id="fadein" id="167" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute">
+      <events>1 2
+3 4
+</events>
+    </AutomationList>
+  </FadeIn>
+</State>
diff --git a/libs/ardour/test/data/automation_list_property_test4.ref b/libs/ardour/test/data/automation_list_property_test4.ref
new file mode 100644
index 0000000000..573e16d291
--- /dev/null
+++ b/libs/ardour/test/data/automation_list_property_test4.ref
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<State>
+  <FadeIn>
+    <AutomationList automation-id="fadein" id="167" default="0" min-yval="0" max-yval="2" interpolation-style="Linear" state="Off" style="Absolute">
+      <events>1 2
+3 4
+5 6
+7 8
+</events>
+    </AutomationList>
+  </FadeIn>
+</State>
diff --git a/libs/ardour/test/load_session.cc b/libs/ardour/test/load_session.cc
new file mode 100644
index 0000000000..3c6bd9bb10
--- /dev/null
+++ b/libs/ardour/test/load_session.cc
@@ -0,0 +1,48 @@
+#include "test_util.h"
+#include "pbd/failed_constructor.h"
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "midi++/manager.h"
+#include <iostream>
+#include <cstdlib>
+
+using namespace std;
+using namespace ARDOUR;
+
+int main (int argc, char* argv[])
+{
+	if (argc != 3) {
+		cerr << "Syntax: " << argv[0] << " <dir> <snapshot-name>\n";
+		exit (EXIT_FAILURE);
+	}
+
+	ARDOUR::init (false, true);
+
+	Session* s = 0;
+	
+	try {
+		s = load_session (argv[1], argv[2]);
+	} catch (failed_constructor& e) {
+		cerr << "failed_constructor: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (AudioEngine::PortRegistrationFailure& e) {
+		cerr << "PortRegistrationFailure: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (exception& e) {
+		cerr << "exception: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (...) {
+		cerr << "unknown exception.\n";
+		exit (EXIT_FAILURE);
+	}
+
+	AudioEngine::instance()->remove_session ();
+	delete s;
+	AudioEngine::instance()->stop (true);
+
+	MIDI::Manager::destroy ();
+	AudioEngine::destroy ();
+
+	return 0;
+}
diff --git a/libs/ardour/test/playlist_equivalent_regions_test.cc b/libs/ardour/test/playlist_equivalent_regions_test.cc
new file mode 100644
index 0000000000..12853d39dd
--- /dev/null
+++ b/libs/ardour/test/playlist_equivalent_regions_test.cc
@@ -0,0 +1,95 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "ardour/playlist.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/region.h"
+#include "playlist_equivalent_regions_test.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION (PlaylistEquivalentRegionsTest);
+
+using namespace std;
+using namespace ARDOUR;
+
+void
+PlaylistEquivalentRegionsTest::setUp ()
+{
+	AudioRegionTest::setUp ();
+	
+	_playlist_b = PlaylistFactory::create (DataType::AUDIO, *_session, "testB");
+}
+
+void
+PlaylistEquivalentRegionsTest::tearDown ()
+{
+	_playlist_b.reset ();
+
+	AudioRegionTest::tearDown ();
+}
+
+/* Test simple equivalency operations */
+void
+PlaylistEquivalentRegionsTest::basicsTest ()
+{
+	/* Put _r[0] on _playlist */
+	_playlist->add_region (_r[0], 42);
+
+	/* And _r[1] on _playlist_b at the same position */
+	_playlist_b->add_region (_r[1], 42);
+
+	/* Look for the equivalents to _r[0] on _playlist_b */
+	vector<boost::shared_ptr<Region> > e;
+	_playlist_b->get_equivalent_regions (_r[0], e);
+
+	/* That should be _r[1] */
+	CPPUNIT_ASSERT_EQUAL (size_t (1), e.size ());
+	CPPUNIT_ASSERT_EQUAL (e.front(), _r[1]);
+
+	/* Move _r[1] */
+	_r[1]->set_position (66);
+
+	/* Look again for the equivalents to _r[0] on _playlist_b */
+	e.clear ();
+	_playlist_b->get_equivalent_regions (_r[0], e);
+
+	/* There should be none */
+	CPPUNIT_ASSERT (e.empty ());
+}
+
+void
+PlaylistEquivalentRegionsTest::multiLayerTest ()
+{
+	_playlist->clear ();
+	_playlist_b->clear ();
+
+	/* Put _r[0] and _r[1] at the same position on _playlist so that they overlap */
+	_playlist->add_region (_r[0], 42);
+	_playlist->add_region (_r[1], 42);
+
+	/* And _r[2], _r[3] similarly on _playlist_b */
+	_playlist_b->add_region (_r[2], 42);
+	_playlist_b->add_region (_r[3], 42);
+
+	/* Look for equivalents to _r[0] on _playlist_b */
+	vector<boost::shared_ptr<Region> > e;
+	_playlist_b->get_equivalent_regions (_r[0], e);
+
+	/* That should be _r[2] and _r[3] */
+	CPPUNIT_ASSERT_EQUAL (size_t (2), e.size ());
+	CPPUNIT_ASSERT ((e.front() == _r[2] && e.back() == _r[3]) || (e.front() == _r[3] && e.back() == _r[2]));
+}
diff --git a/libs/ardour/test/playlist_equivalent_regions_test.h b/libs/ardour/test/playlist_equivalent_regions_test.h
new file mode 100644
index 0000000000..a3447bbe80
--- /dev/null
+++ b/libs/ardour/test/playlist_equivalent_regions_test.h
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "audio_region_test.h"
+
+class PlaylistEquivalentRegionsTest : public AudioRegionTest
+{
+	CPPUNIT_TEST_SUITE (PlaylistEquivalentRegionsTest);
+	CPPUNIT_TEST (basicsTest);
+	CPPUNIT_TEST (multiLayerTest);
+	CPPUNIT_TEST_SUITE_END ();
+
+public:
+	void setUp ();
+	void tearDown ();
+	void basicsTest ();
+	void multiLayerTest ();
+
+private:
+	boost::shared_ptr<ARDOUR::Playlist> _playlist_b;
+};
diff --git a/libs/ardour/test/profiling/load_session.cc b/libs/ardour/test/profiling/load_session.cc
new file mode 100644
index 0000000000..3c6bd9bb10
--- /dev/null
+++ b/libs/ardour/test/profiling/load_session.cc
@@ -0,0 +1,48 @@
+#include "test_util.h"
+#include "pbd/failed_constructor.h"
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "midi++/manager.h"
+#include <iostream>
+#include <cstdlib>
+
+using namespace std;
+using namespace ARDOUR;
+
+int main (int argc, char* argv[])
+{
+	if (argc != 3) {
+		cerr << "Syntax: " << argv[0] << " <dir> <snapshot-name>\n";
+		exit (EXIT_FAILURE);
+	}
+
+	ARDOUR::init (false, true);
+
+	Session* s = 0;
+	
+	try {
+		s = load_session (argv[1], argv[2]);
+	} catch (failed_constructor& e) {
+		cerr << "failed_constructor: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (AudioEngine::PortRegistrationFailure& e) {
+		cerr << "PortRegistrationFailure: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (exception& e) {
+		cerr << "exception: " << e.what() << "\n";
+		exit (EXIT_FAILURE);
+	} catch (...) {
+		cerr << "unknown exception.\n";
+		exit (EXIT_FAILURE);
+	}
+
+	AudioEngine::instance()->remove_session ();
+	delete s;
+	AudioEngine::instance()->stop (true);
+
+	MIDI::Manager::destroy ();
+	AudioEngine::destroy ();
+
+	return 0;
+}
diff --git a/libs/ardour/test/profiling/lots_of_regions.cc b/libs/ardour/test/profiling/lots_of_regions.cc
new file mode 100644
index 0000000000..5c27e8425a
--- /dev/null
+++ b/libs/ardour/test/profiling/lots_of_regions.cc
@@ -0,0 +1,49 @@
+#include "test_util.h"
+#include "ardour/ardour.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/session.h"
+#include "ardour/playlist.h"
+#include "pbd/stateful_diff_command.h"
+
+using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
+
+int
+main (int argc, char* argv[])
+{
+	ARDOUR::init (false, true);
+	Session* session = load_session ("../libs/ardour/test/profiling/sessions/1region", "1region");
+
+	assert (session->get_routes()->size() == 2);
+
+	/* Find the track */
+	boost::shared_ptr<MidiTrack> track = boost::dynamic_pointer_cast<MidiTrack> (session->get_routes()->back());
+	assert (track);
+
+	/* And the playlist */
+	boost::shared_ptr<Playlist> playlist = track->playlist ();
+	assert (playlist);
+
+	/* And the region */
+	boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (playlist->region_list().rlist().front());
+	assert (region);
+
+	/* Duplicate it a lot */
+	session->begin_reversible_command ("foo");
+	playlist->clear_changes ();
+	playlist->duplicate (region, region->last_frame(), 1000);
+	session->add_command (new StatefulDiffCommand (playlist));
+	session->commit_reversible_command ();
+
+	/* Undo that */
+	session->undo (1);
+
+	/* And do it again */
+	session->begin_reversible_command ("foo");
+	playlist->clear_changes ();
+	playlist->duplicate (region, region->last_frame(), 1000);
+	session->add_command (new StatefulDiffCommand (playlist));
+	session->commit_reversible_command ();
+}
diff --git a/libs/ardour/test/profiling/runpc.cc b/libs/ardour/test/profiling/runpc.cc
index 90f9136e23..ef5d322df2 100644
--- a/libs/ardour/test/profiling/runpc.cc
+++ b/libs/ardour/test/profiling/runpc.cc
@@ -5,49 +5,12 @@
 #include "pbd/enumwriter.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "test_util.h"
 
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-class TestReceiver : public Receiver 
-{
-protected:
-	void receive (Transmitter::Channel chn, const char * str) {
-		const char *prefix = "";
-		
-		switch (chn) {
-		case Transmitter::Error:
-			prefix = ": [ERROR]: ";
-			break;
-		case Transmitter::Info:
-			/* ignore */
-			return;
-		case Transmitter::Warning:
-			prefix = ": [WARNING]: ";
-			break;
-		case Transmitter::Fatal:
-			prefix = ": [FATAL]: ";
-			break;
-		case Transmitter::Throw:
-			/* this isn't supposed to happen */
-			abort ();
-		}
-		
-		/* note: iostreams are already thread-safe: no external
-		   lock required.
-		*/
-		
-		cout << prefix << str << endl;
-		
-		if (chn == Transmitter::Fatal) {
-			exit (9);
-		}
-	}
-};
-
-TestReceiver test_receiver;
-
 int
 main (int argc, char* argv[])
 {
@@ -55,29 +18,18 @@ main (int argc, char* argv[])
 		cerr << argv[0] << ": <session>\n";
 		exit (EXIT_FAILURE);
 	}
-	
-	string const test_session_path = string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]);
-	string const test_session_snapshot = string_compose ("%1.ardour", argv[1]);
-	
-	init (false, true);
-	SessionEvent::create_per_thread_pool ("test", 512);
 
-	test_receiver.listen_to (error);
-	test_receiver.listen_to (info);
-	test_receiver.listen_to (fatal);
-	test_receiver.listen_to (warning);
+	ARDOUR::init (false, true);
 
-	AudioEngine* engine = new AudioEngine ("test", "");
-	engine->start ();
-	MIDI::Manager::create (engine->jack ());
-
-	Session* session = new Session (*engine, test_session_path, test_session_snapshot);
-	engine->set_session (session);
+	Session* session = load_session (
+		string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]),
+		string_compose ("%1.ardour", argv[1])
+		);
 
 	cout << "INFO: " << session->get_routes()->size() << " routes.\n";
 
 	for (int i = 0; i < 32768; ++i) {
-		session->process (64);
+		session->process (session->engine().frames_per_cycle ());
 	}
 
 	return 0;
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.ardour b/libs/ardour/test/profiling/sessions/1region/1region.ardour
new file mode 100644
index 0000000000..a3fc264dab
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/1region.ardour
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Session version="3001" name="1region" sample-rate="48000" id-counter="140" event-counter="1">
+  <Config>
+    <Option name="xfade-model" value="FullCrossfade"/>
+    <Option name="xfade-choice" value="ConstantPowerMinus3dB"/>
+    <Option name="auto-xfade" value="1"/>
+    <Option name="short-xfade-seconds" value="0.015"/>
+    <Option name="destructive-xfade-msecs" value="2"/>
+    <Option name="use-region-fades" value="1"/>
+    <Option name="show-region-fades" value="1"/>
+    <Option name="native-file-data-format" value="FormatFloat"/>
+    <Option name="native-file-header-format" value="WAVE"/>
+    <Option name="auto-play" value="0"/>
+    <Option name="auto-return" value="0"/>
+    <Option name="auto-input" value="1"/>
+    <Option name="punch-in" value="0"/>
+    <Option name="punch-out" value="0"/>
+    <Option name="subframes-per-frame" value="100"/>
+    <Option name="timecode-format" value="timecode_30"/>
+    <Option name="raid-path" value=""/>
+    <Option name="audio-search-path" value=""/>
+    <Option name="midi-search-path" value=""/>
+    <Option name="auditioner-output-left" value="default"/>
+    <Option name="auditioner-output-right" value="default"/>
+    <Option name="timecode-source-is-synced" value="1"/>
+    <Option name="jack-time-master" value="1"/>
+    <Option name="use-video-sync" value="0"/>
+    <Option name="video-pullup" value="0"/>
+    <Option name="show-summary" value="1"/>
+    <Option name="show-group-tabs" value="1"/>
+    <Option name="external-sync" value="0"/>
+    <Option name="sync-source" value="JACK"/>
+    <Option name="insert-merge-policy" value="InsertMergeRelax"/>
+    <Option name="timecode-offset" value="0"/>
+    <Option name="timecode-offset-negative" value="1"/>
+    <Option name="glue-new-markers-to-bars-and-beats" value="0"/>
+    <Option name="midi-copy-is-fork" value="0"/>
+    <Option name="glue-new-regions-to-bars-and-beats" value="0"/>
+  </Config>
+  <Metadata/>
+  <Sources>
+    <Source name="MIDI 1-1.mid" type="midi" flags="Writable,CanRename" id="118" origin=""/>
+  </Sources>
+  <Regions/>
+  <Locations>
+    <Location id="86" name="Loop" start="529680" end="1089150" flags="IsAutoLoop,IsHidden" locked="no" position-lock-style="AudioTime"/>
+    <Location id="87" name="Punch" start="0" end="1" flags="IsAutoPunch,IsHidden" locked="no" position-lock-style="AudioTime"/>
+    <Location id="134" name="session" start="529680" end="1089150" flags="IsSessionRange" locked="no" position-lock-style="AudioTime"/>
+  </Locations>
+  <Bundles/>
+  <Routes>
+    <Route id="21" name="master" default-type="audio" flags="MasterOut" active="yes" phase-invert="00" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=0:signal=0" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no">
+      <IO name="master" id="38" direction="Input" default-type="audio" user-latency="0">
+        <Port type="audio" name="master/audio_in 1"/>
+        <Port type="audio" name="master/audio_in 2"/>
+      </IO>
+      <IO name="master" id="39" direction="Output" default-type="audio" user-latency="0">
+        <Port type="audio" name="master/audio_out 1">
+          <Connection other="system:playback_1"/>
+        </Port>
+        <Port type="audio" name="master/audio_out 2">
+          <Connection other="system:playback_2"/>
+        </Port>
+      </IO>
+      <Controllable name="solo" id="23" flags="Toggle" value="0.000000000000"/>
+      <Controllable name="mute" id="25" flags="Toggle" value="0.000000000000"/>
+      <MuteMaster mute-point="PreFader,PostFader,Listen,Main" muted="no"/>
+      <RemoteControl id="318"/>
+      <Pannable>
+        <Controllable name="pan-azimuth" id="29" flags="" value="0.500000000000"/>
+        <Controllable name="pan-width" id="33" flags="" value="1.000000000000"/>
+        <Controllable name="pan-elevation" id="31" flags="" value="0.000000000000"/>
+        <Controllable name="pan-frontback" id="35" flags="" value="0.000000000000"/>
+        <Controllable name="pan-lfe" id="37" flags="" value="0.000000000000"/>
+        <Automation/>
+      </Pannable>
+      <Processor id="40" name="Amp" active="yes" user-latency="0" type="amp">
+        <Controllable name="gaincontrol" id="42" flags="GainLike" value="1.000000000000"/>
+      </Processor>
+      <Processor id="43" name="Meter" active="yes" user-latency="0" type="meter"/>
+      <Processor id="44" name="master" active="yes" user-latency="0" own-input="yes" own-output="no" output="master" type="main-outs" role="Main">
+        <PannerShell bypassed="no">
+          <Panner type="Equal Power Stereo"/>
+        </PannerShell>
+      </Processor>
+    </Route>
+    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=1:signal=1" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" input-active="yes">
+      <IO name="MIDI 1" id="105" direction="Input" default-type="midi" user-latency="0">
+        <Port type="midi" name="MIDI 1/midi_in 1"/>
+      </IO>
+      <IO name="MIDI 1" id="106" direction="Output" default-type="midi" user-latency="0">
+        <Port type="midi" name="MIDI 1/midi_out 1"/>
+      </IO>
+      <Controllable name="solo" id="90" flags="Toggle" value="0.000000000000"/>
+      <Controllable name="mute" id="92" flags="Toggle" value="0.000000000000"/>
+      <MuteMaster mute-point="PreFader,PostFader,Listen,Main" muted="no"/>
+      <RemoteControl id="2"/>
+      <Pannable>
+        <Controllable name="pan-azimuth" id="96" flags="" value="0.500000000000"/>
+        <Controllable name="pan-width" id="100" flags="" value="0.000000000000"/>
+        <Controllable name="pan-elevation" id="98" flags="" value="0.000000000000"/>
+        <Controllable name="pan-frontback" id="102" flags="" value="0.000000000000"/>
+        <Controllable name="pan-lfe" id="104" flags="" value="0.000000000000"/>
+        <Automation/>
+      </Pannable>
+      <Processor id="107" name="Amp" active="yes" user-latency="0" type="amp">
+        <Controllable name="gaincontrol" id="109" flags="GainLike" value="1.000000000000"/>
+      </Processor>
+      <Processor id="110" name="Meter" active="yes" user-latency="0" type="meter"/>
+      <Processor id="111" name="MIDI 1" active="yes" user-latency="0" own-input="yes" own-output="no" output="MIDI 1" type="main-outs" role="Main">
+        <PannerShell bypassed="no"/>
+      </Processor>
+      <Controllable name="recenable" id="113" flags="Toggle" value="0.000000000000"/>
+      <Diskstream flags="Recordable" playlist="MIDI 1.1" name="MIDI 1" id="115" speed="1.000000" capture-alignment="Automatic" channel-mode="AllChannels" channel-mask="0xffff"/>
+    </Route>
+  </Routes>
+  <Playlists>
+    <Playlist id="116" name="MIDI 1.1" type="midi" orig-track-id="88" frozen="no" combine-ops="0">
+      <Region locked="0" name="MIDI 1-1" position="529680" length="559470" stretch="1" muted="0" opaque="1" automatic="0" whole-file="0" import="0" external="0" sync-marked="0" left-of-split="0" right-of-split="0" hidden="0" position-locked="0" valid-transients="0" start="0" sync-position="0" ancestral-start="0" ancestral-length="0" shift="1" positional-lock-style="MusicTime" layering-index="0" start-beats="0" length-beats="23.31125" id="131" type="midi" first-edit="nothing" bbt-position="6|3|134" source-0="118" master-source-0="118"/>
+    </Playlist>
+  </Playlists>
+  <UnusedPlaylists/>
+  <RouteGroups/>
+  <Click>
+    <IO name="click" id="46" direction="Output" default-type="audio" user-latency="0">
+      <Port type="audio" name="click/audio_out 1">
+        <Connection other="system:playback_1"/>
+      </Port>
+      <Port type="audio" name="click/audio_out 2">
+        <Connection other="system:playback_2"/>
+      </Port>
+    </IO>
+    <Processor id="47" name="Amp" active="yes" user-latency="0" type="amp">
+      <Controllable name="gaincontrol" id="49" flags="GainLike" value="1.000000000000"/>
+    </Processor>
+  </Click>
+  <NamedSelections/>
+  <Speakers>
+    <Speaker azimuth="0" elevation="0" distance="1"/>
+    <Speaker azimuth="180" elevation="0" distance="0"/>
+  </Speakers>
+  <TempoMap>
+    <Tempo start="1|1|0" beats-per-minute="120.000000" note-type="4.000000" movable="no"/>
+    <Meter start="1|1|0" note-type="4.000000" divisions-per-bar="4.000000" movable="no"/>
+  </TempoMap>
+  <ControlProtocols>
+    <Protocol name="Open Sound Control (OSC)" active="no"/>
+    <Protocol name="Generic MIDI" feedback="0" feedback-interval="10000" active="yes">
+      <Controls/>
+    </Protocol>
+    <Protocol name="Mackie" bank="0" ipmidi-base="21928" device-profile="" device-name="Mackie Control Universal Pro" active="yes"/>
+  </ControlProtocols>
+  <Extra>
+    <UI>
+      <Window name="M-21-40" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-21-43" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-21-44" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-88-107" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-88-110" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-88-111" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="R-88-107" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="R-88-110" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="R-88-111" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <GUIObjectState>
+        <Object id="route 21" color="41362:19043:7132"/>
+        <Object id="rtav 21" height="62" visible="1"/>
+        <Object id="automation 42" height="62" visible="0"/>
+        <Object id="automation 29" height="62" visible="0"/>
+        <Object id="automation 33" height="62" visible="0"/>
+        <Object id="strip 21" visible="1">
+          <Object id="processor 40"/>
+        </Object>
+        <Object id="route 88" color="32992:47392:14682"/>
+        <Object id="rtav 88" height="102" visible="1" note-range-min="60" note-range-max="71" color-mode="MeterColors"/>
+        <Object id="strip 88" visible="1">
+          <Object id="processor 107"/>
+        </Object>
+      </GUIObjectState>
+    </UI>
+  </Extra>
+</Session>
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak b/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak
new file mode 100644
index 0000000000..4a3e63f351
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Session version="3001" name="1region" sample-rate="48000" id-counter="120" event-counter="0">
+  <Config>
+    <Option name="xfade-model" value="FullCrossfade"/>
+    <Option name="xfade-choice" value="ConstantPowerMinus3dB"/>
+    <Option name="auto-xfade" value="1"/>
+    <Option name="short-xfade-seconds" value="0.015"/>
+    <Option name="destructive-xfade-msecs" value="2"/>
+    <Option name="use-region-fades" value="1"/>
+    <Option name="show-region-fades" value="1"/>
+    <Option name="native-file-data-format" value="FormatFloat"/>
+    <Option name="native-file-header-format" value="WAVE"/>
+    <Option name="auto-play" value="0"/>
+    <Option name="auto-return" value="0"/>
+    <Option name="auto-input" value="1"/>
+    <Option name="punch-in" value="0"/>
+    <Option name="punch-out" value="0"/>
+    <Option name="subframes-per-frame" value="100"/>
+    <Option name="timecode-format" value="timecode_30"/>
+    <Option name="raid-path" value=""/>
+    <Option name="audio-search-path" value=""/>
+    <Option name="midi-search-path" value=""/>
+    <Option name="auditioner-output-left" value="default"/>
+    <Option name="auditioner-output-right" value="default"/>
+    <Option name="timecode-source-is-synced" value="1"/>
+    <Option name="jack-time-master" value="1"/>
+    <Option name="use-video-sync" value="0"/>
+    <Option name="video-pullup" value="0"/>
+    <Option name="show-summary" value="1"/>
+    <Option name="show-group-tabs" value="1"/>
+    <Option name="external-sync" value="0"/>
+    <Option name="sync-source" value="JACK"/>
+    <Option name="insert-merge-policy" value="InsertMergeRelax"/>
+    <Option name="timecode-offset" value="0"/>
+    <Option name="timecode-offset-negative" value="1"/>
+    <Option name="glue-new-markers-to-bars-and-beats" value="0"/>
+    <Option name="midi-copy-is-fork" value="0"/>
+    <Option name="glue-new-regions-to-bars-and-beats" value="0"/>
+  </Config>
+  <Metadata/>
+  <Sources/>
+  <Regions/>
+  <Locations>
+    <Location id="86" name="Loop" start="0" end="1" flags="IsAutoLoop,IsHidden" locked="no" position-lock-style="AudioTime"/>
+    <Location id="87" name="Punch" start="0" end="1" flags="IsAutoPunch,IsHidden" locked="no" position-lock-style="AudioTime"/>
+  </Locations>
+  <Bundles/>
+  <Routes>
+    <Route id="21" name="master" default-type="audio" flags="MasterOut" active="yes" phase-invert="00" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=0:signal=0" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no">
+      <IO name="master" id="38" direction="Input" default-type="audio" user-latency="0">
+        <Port type="audio" name="master/audio_in 1"/>
+        <Port type="audio" name="master/audio_in 2"/>
+      </IO>
+      <IO name="master" id="39" direction="Output" default-type="audio" user-latency="0">
+        <Port type="audio" name="master/audio_out 1">
+          <Connection other="system:playback_1"/>
+        </Port>
+        <Port type="audio" name="master/audio_out 2">
+          <Connection other="system:playback_2"/>
+        </Port>
+      </IO>
+      <Controllable name="solo" id="23" flags="Toggle" value="0.000000000000"/>
+      <Controllable name="mute" id="25" flags="Toggle" value="0.000000000000"/>
+      <MuteMaster mute-point="PreFader,PostFader,Listen,Main" muted="no"/>
+      <RemoteControl id="318"/>
+      <Pannable>
+        <Controllable name="pan-azimuth" id="29" flags="" value="0.500000000000"/>
+        <Controllable name="pan-width" id="33" flags="" value="1.000000000000"/>
+        <Controllable name="pan-elevation" id="31" flags="" value="0.000000000000"/>
+        <Controllable name="pan-frontback" id="35" flags="" value="0.000000000000"/>
+        <Controllable name="pan-lfe" id="37" flags="" value="0.000000000000"/>
+        <Automation/>
+      </Pannable>
+      <Processor id="40" name="Amp" active="yes" user-latency="0" type="amp">
+        <Controllable name="gaincontrol" id="42" flags="GainLike" value="1.000000000000"/>
+      </Processor>
+      <Processor id="43" name="Meter" active="yes" user-latency="0" type="meter"/>
+      <Processor id="44" name="master" active="yes" user-latency="0" own-input="yes" own-output="no" output="master" type="main-outs" role="Main">
+        <PannerShell bypassed="no">
+          <Panner type="Equal Power Stereo"/>
+        </PannerShell>
+      </Processor>
+    </Route>
+    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=2" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" input-active="yes">
+      <IO name="MIDI 1" id="105" direction="Input" default-type="midi" user-latency="0">
+        <Port type="midi" name="MIDI 1/midi_in 1"/>
+      </IO>
+      <IO name="MIDI 1" id="106" direction="Output" default-type="midi" user-latency="0">
+        <Port type="midi" name="MIDI 1/midi_out 1"/>
+      </IO>
+      <Controllable name="solo" id="90" flags="Toggle" value="0.000000000000"/>
+      <Controllable name="mute" id="92" flags="Toggle" value="0.000000000000"/>
+      <MuteMaster mute-point="PreFader,PostFader,Listen,Main" muted="no"/>
+      <RemoteControl id="2"/>
+      <Pannable>
+        <Controllable name="pan-azimuth" id="96" flags="" value="0.500000000000"/>
+        <Controllable name="pan-width" id="100" flags="" value="0.000000000000"/>
+        <Controllable name="pan-elevation" id="98" flags="" value="0.000000000000"/>
+        <Controllable name="pan-frontback" id="102" flags="" value="0.000000000000"/>
+        <Controllable name="pan-lfe" id="104" flags="" value="0.000000000000"/>
+        <Automation/>
+      </Pannable>
+      <Processor id="107" name="Amp" active="yes" user-latency="0" type="amp">
+        <Controllable name="gaincontrol" id="109" flags="GainLike" value="1.000000000000"/>
+      </Processor>
+      <Processor id="110" name="Meter" active="yes" user-latency="0" type="meter"/>
+      <Processor id="111" name="MIDI 1" active="yes" user-latency="0" own-input="yes" own-output="no" output="MIDI 1" type="main-outs" role="Main">
+        <PannerShell bypassed="no"/>
+      </Processor>
+      <Controllable name="recenable" id="113" flags="Toggle" value="0.000000000000"/>
+      <Diskstream flags="Recordable" playlist="MIDI 1.1" name="MIDI 1" id="115" speed="1.000000" capture-alignment="Automatic" channel-mode="AllChannels" channel-mask="0xffff"/>
+    </Route>
+  </Routes>
+  <Playlists>
+    <Playlist id="116" name="MIDI 1.1" type="midi" orig-track-id="88" frozen="no" combine-ops="0"/>
+  </Playlists>
+  <UnusedPlaylists/>
+  <RouteGroups/>
+  <Click>
+    <IO name="click" id="46" direction="Output" default-type="audio" user-latency="0">
+      <Port type="audio" name="click/audio_out 1">
+        <Connection other="system:playback_1"/>
+      </Port>
+      <Port type="audio" name="click/audio_out 2">
+        <Connection other="system:playback_2"/>
+      </Port>
+    </IO>
+    <Processor id="47" name="Amp" active="yes" user-latency="0" type="amp">
+      <Controllable name="gaincontrol" id="49" flags="GainLike" value="1.000000000000"/>
+    </Processor>
+  </Click>
+  <NamedSelections/>
+  <Speakers>
+    <Speaker azimuth="0" elevation="0" distance="1"/>
+    <Speaker azimuth="180" elevation="0" distance="0"/>
+  </Speakers>
+  <TempoMap>
+    <Tempo start="1|1|0" beats-per-minute="120.000000" note-type="4.000000" movable="no"/>
+    <Meter start="1|1|0" note-type="4.000000" divisions-per-bar="4.000000" movable="no"/>
+  </TempoMap>
+  <ControlProtocols>
+    <Protocol name="Open Sound Control (OSC)" active="no"/>
+    <Protocol name="Generic MIDI" feedback="0" feedback-interval="10000" active="yes">
+      <Controls/>
+    </Protocol>
+    <Protocol name="Mackie" bank="0" ipmidi-base="21928" device-profile="" device-name="Mackie Control Universal Pro" active="yes"/>
+  </ControlProtocols>
+</Session>
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.history b/libs/ardour/test/profiling/sessions/1region/1region.history
new file mode 100644
index 0000000000..27732c0340
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/1region.history
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<UndoHistory>
+  <UndoTransaction tv-sec="1340037919" tv-usec="627348" name="create region">
+    <StatefulDiffCommand obj-id="116" type-name="ARDOUR::MidiPlaylist">
+      <Changes>
+        <Regions>
+          <Add id="131"/>
+        </Regions>
+      </Changes>
+    </StatefulDiffCommand>
+  </UndoTransaction>
+  <UndoTransaction tv-sec="1340037923" tv-usec="327852" name="Region end trim">
+    <StatefulDiffCommand obj-id="131" type-name="ARDOUR::MidiRegion">
+      <Changes>
+        <length from="96000" to="559470"/>
+        <length-beats from="4" to="23.31125"/>
+      </Changes>
+    </StatefulDiffCommand>
+  </UndoTransaction>
+  <UndoTransaction tv-sec="1340037927" tv-usec="128795" name="add note">
+    <NoteDiffCommand midi-source="118">
+      <ChangedNotes/>
+      <AddedNotes>
+        <note id="0" note="68" channel="0" time="3.67833" length="12.8742" velocity="64"/>
+      </AddedNotes>
+      <RemovedNotes/>
+    </NoteDiffCommand>
+  </UndoTransaction>
+</UndoHistory>
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.history.bak b/libs/ardour/test/profiling/sessions/1region/1region.history.bak
new file mode 100644
index 0000000000..6dd2506a89
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/1region.history.bak
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<UndoHistory/>
diff --git a/libs/ardour/test/profiling/sessions/1region/instant.xml b/libs/ardour/test/profiling/sessions/1region/instant.xml
new file mode 100644
index 0000000000..5f0c8e83dd
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/instant.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instant>
+  <Editor id="11" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="4413.999148" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtPlayhead" playhead="0" left-frame="0" y-origin="0.000000" show-measures="yes" maximised="no" follow-playhead="no" stationary-playhead="no" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" internal-edit="yes" join-object-range="no" show-editor-mixer="yes" show-editor-list="yes" editor-list-page="1" show-marker-lines="yes" nudge-clock-value="240000">
+    <geometry x-size="1366" y-size="714" x-pos="0" y-pos="27" edit-horizontal-pane-pos="1011" notebook-shrunk="0" edit-vertical-pane-pos="518"/>
+    <Buttons>
+      <Press/>
+      <Release/>
+    </Buttons>
+    <Selection/>
+    <RegionList sort-type="ByEndInFile" sort-ascending="yes" show-all="no" show-automatic-regions="yes"/>
+  </Editor>
+  <Mixer narrow-strips="no" show-mixer="no"/>
+</instant>
diff --git a/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid b/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid
new file mode 100644
index 0000000000..80d4f9fda2
Binary files /dev/null and b/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid differ
diff --git a/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour b/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour
index 43b597c17b..6794c67bc9 100644
--- a/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour
+++ b/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Session version="3.0.0" name="32tracks" sample-rate="44100" id-counter="1235" event-counter="0">
+<Session version="3001" name="32tracks" sample-rate="44100" id-counter="2430" event-counter="0">
   <Config>
     <Option name="xfade-model" value="FullCrossfade"/>
+    <Option name="xfade-choice" value="ConstantPowerMinus3dB"/>
     <Option name="auto-xfade" value="1"/>
     <Option name="short-xfade-seconds" value="0.015"/>
-    <Option name="xfades-active" value="1"/>
-    <Option name="xfades-visible" value="1"/>
     <Option name="destructive-xfade-msecs" value="2"/>
     <Option name="use-region-fades" value="1"/>
     <Option name="show-region-fades" value="1"/>
@@ -21,8 +20,6 @@
     <Option name="raid-path" value=""/>
     <Option name="audio-search-path" value=""/>
     <Option name="midi-search-path" value=""/>
-    <Option name="bwf-country-code" value="US"/>
-    <Option name="bwf-organization-code" value="US"/>
     <Option name="auditioner-output-left" value="default"/>
     <Option name="auditioner-output-right" value="default"/>
     <Option name="timecode-source-is-synced" value="1"/>
@@ -52,72 +49,72 @@
     <Route id="22" name="master" default-type="audio" flags="MasterOut" active="yes" phase-invert="00" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=0:signal=0" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no">
       <IO name="master" id="39" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="master/audio_in 1">
-          <Connection other="Audio 32/audio_out 1"/>
-          <Connection other="Audio 31/audio_out 1"/>
-          <Connection other="Audio 30/audio_out 1"/>
-          <Connection other="Audio 29/audio_out 1"/>
-          <Connection other="Audio 28/audio_out 1"/>
-          <Connection other="Audio 27/audio_out 1"/>
-          <Connection other="Audio 26/audio_out 1"/>
-          <Connection other="Audio 25/audio_out 1"/>
-          <Connection other="Audio 24/audio_out 1"/>
-          <Connection other="Audio 23/audio_out 1"/>
-          <Connection other="Audio 22/audio_out 1"/>
-          <Connection other="Audio 21/audio_out 1"/>
-          <Connection other="Audio 20/audio_out 1"/>
-          <Connection other="Audio 19/audio_out 1"/>
-          <Connection other="Audio 18/audio_out 1"/>
-          <Connection other="Audio 17/audio_out 1"/>
-          <Connection other="Audio 16/audio_out 1"/>
-          <Connection other="Audio 15/audio_out 1"/>
-          <Connection other="Audio 14/audio_out 1"/>
-          <Connection other="Audio 13/audio_out 1"/>
-          <Connection other="Audio 12/audio_out 1"/>
-          <Connection other="Audio 11/audio_out 1"/>
-          <Connection other="Audio 10/audio_out 1"/>
-          <Connection other="Audio 9/audio_out 1"/>
-          <Connection other="Audio 8/audio_out 1"/>
-          <Connection other="Audio 7/audio_out 1"/>
-          <Connection other="Audio 6/audio_out 1"/>
-          <Connection other="Audio 5/audio_out 1"/>
-          <Connection other="Audio 4/audio_out 1"/>
-          <Connection other="Audio 3/audio_out 1"/>
-          <Connection other="Audio 2/audio_out 1"/>
           <Connection other="Audio 1/audio_out 1"/>
+          <Connection other="Audio 2/audio_out 1"/>
+          <Connection other="Audio 3/audio_out 1"/>
+          <Connection other="Audio 4/audio_out 1"/>
+          <Connection other="Audio 5/audio_out 1"/>
+          <Connection other="Audio 6/audio_out 1"/>
+          <Connection other="Audio 7/audio_out 1"/>
+          <Connection other="Audio 8/audio_out 1"/>
+          <Connection other="Audio 9/audio_out 1"/>
+          <Connection other="Audio 10/audio_out 1"/>
+          <Connection other="Audio 11/audio_out 1"/>
+          <Connection other="Audio 12/audio_out 1"/>
+          <Connection other="Audio 13/audio_out 1"/>
+          <Connection other="Audio 14/audio_out 1"/>
+          <Connection other="Audio 15/audio_out 1"/>
+          <Connection other="Audio 16/audio_out 1"/>
+          <Connection other="Audio 17/audio_out 1"/>
+          <Connection other="Audio 18/audio_out 1"/>
+          <Connection other="Audio 19/audio_out 1"/>
+          <Connection other="Audio 20/audio_out 1"/>
+          <Connection other="Audio 21/audio_out 1"/>
+          <Connection other="Audio 22/audio_out 1"/>
+          <Connection other="Audio 23/audio_out 1"/>
+          <Connection other="Audio 24/audio_out 1"/>
+          <Connection other="Audio 25/audio_out 1"/>
+          <Connection other="Audio 26/audio_out 1"/>
+          <Connection other="Audio 27/audio_out 1"/>
+          <Connection other="Audio 28/audio_out 1"/>
+          <Connection other="Audio 29/audio_out 1"/>
+          <Connection other="Audio 30/audio_out 1"/>
+          <Connection other="Audio 31/audio_out 1"/>
+          <Connection other="Audio 32/audio_out 1"/>
         </Port>
         <Port type="audio" name="master/audio_in 2">
-          <Connection other="Audio 32/audio_out 2"/>
-          <Connection other="Audio 31/audio_out 2"/>
-          <Connection other="Audio 30/audio_out 2"/>
-          <Connection other="Audio 29/audio_out 2"/>
-          <Connection other="Audio 28/audio_out 2"/>
-          <Connection other="Audio 27/audio_out 2"/>
-          <Connection other="Audio 26/audio_out 2"/>
-          <Connection other="Audio 25/audio_out 2"/>
-          <Connection other="Audio 24/audio_out 2"/>
-          <Connection other="Audio 23/audio_out 2"/>
-          <Connection other="Audio 22/audio_out 2"/>
-          <Connection other="Audio 21/audio_out 2"/>
-          <Connection other="Audio 20/audio_out 2"/>
-          <Connection other="Audio 19/audio_out 2"/>
-          <Connection other="Audio 18/audio_out 2"/>
-          <Connection other="Audio 17/audio_out 2"/>
-          <Connection other="Audio 16/audio_out 2"/>
-          <Connection other="Audio 15/audio_out 2"/>
-          <Connection other="Audio 14/audio_out 2"/>
-          <Connection other="Audio 13/audio_out 2"/>
-          <Connection other="Audio 12/audio_out 2"/>
-          <Connection other="Audio 11/audio_out 2"/>
-          <Connection other="Audio 10/audio_out 2"/>
-          <Connection other="Audio 9/audio_out 2"/>
-          <Connection other="Audio 8/audio_out 2"/>
-          <Connection other="Audio 7/audio_out 2"/>
-          <Connection other="Audio 6/audio_out 2"/>
-          <Connection other="Audio 5/audio_out 2"/>
-          <Connection other="Audio 4/audio_out 2"/>
-          <Connection other="Audio 3/audio_out 2"/>
-          <Connection other="Audio 2/audio_out 2"/>
           <Connection other="Audio 1/audio_out 2"/>
+          <Connection other="Audio 2/audio_out 2"/>
+          <Connection other="Audio 3/audio_out 2"/>
+          <Connection other="Audio 4/audio_out 2"/>
+          <Connection other="Audio 5/audio_out 2"/>
+          <Connection other="Audio 6/audio_out 2"/>
+          <Connection other="Audio 7/audio_out 2"/>
+          <Connection other="Audio 8/audio_out 2"/>
+          <Connection other="Audio 9/audio_out 2"/>
+          <Connection other="Audio 10/audio_out 2"/>
+          <Connection other="Audio 11/audio_out 2"/>
+          <Connection other="Audio 12/audio_out 2"/>
+          <Connection other="Audio 13/audio_out 2"/>
+          <Connection other="Audio 14/audio_out 2"/>
+          <Connection other="Audio 15/audio_out 2"/>
+          <Connection other="Audio 16/audio_out 2"/>
+          <Connection other="Audio 17/audio_out 2"/>
+          <Connection other="Audio 18/audio_out 2"/>
+          <Connection other="Audio 19/audio_out 2"/>
+          <Connection other="Audio 20/audio_out 2"/>
+          <Connection other="Audio 21/audio_out 2"/>
+          <Connection other="Audio 22/audio_out 2"/>
+          <Connection other="Audio 23/audio_out 2"/>
+          <Connection other="Audio 24/audio_out 2"/>
+          <Connection other="Audio 25/audio_out 2"/>
+          <Connection other="Audio 26/audio_out 2"/>
+          <Connection other="Audio 27/audio_out 2"/>
+          <Connection other="Audio 28/audio_out 2"/>
+          <Connection other="Audio 29/audio_out 2"/>
+          <Connection other="Audio 30/audio_out 2"/>
+          <Connection other="Audio 31/audio_out 2"/>
+          <Connection other="Audio 32/audio_out 2"/>
         </Port>
       </IO>
       <IO name="master" id="40" direction="Output" default-type="audio" user-latency="0">
@@ -228,9 +225,7 @@
     </Route>
     <Route id="147" name="Audio 3" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=3:signal=3" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 3" id="165" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 3/audio_in 1">
-          <Connection other="system:capture_3"/>
-        </Port>
+        <Port type="audio" name="Audio 3/audio_in 1"/>
       </IO>
       <IO name="Audio 3" id="166" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 3/audio_out 1">
@@ -266,9 +261,7 @@
     </Route>
     <Route id="179" name="Audio 4" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=4:signal=4" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 4" id="197" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 4/audio_in 1">
-          <Connection other="system:capture_4"/>
-        </Port>
+        <Port type="audio" name="Audio 4/audio_in 1"/>
       </IO>
       <IO name="Audio 4" id="198" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 4/audio_out 1">
@@ -304,9 +297,7 @@
     </Route>
     <Route id="211" name="Audio 5" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=5:signal=5" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 5" id="229" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 5/audio_in 1">
-          <Connection other="system:capture_5"/>
-        </Port>
+        <Port type="audio" name="Audio 5/audio_in 1"/>
       </IO>
       <IO name="Audio 5" id="230" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 5/audio_out 1">
@@ -342,9 +333,7 @@
     </Route>
     <Route id="243" name="Audio 6" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=6:signal=6" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 6" id="261" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 6/audio_in 1">
-          <Connection other="system:capture_6"/>
-        </Port>
+        <Port type="audio" name="Audio 6/audio_in 1"/>
       </IO>
       <IO name="Audio 6" id="262" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 6/audio_out 1">
@@ -380,9 +369,7 @@
     </Route>
     <Route id="275" name="Audio 7" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=7:signal=7" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 7" id="293" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 7/audio_in 1">
-          <Connection other="system:capture_7"/>
-        </Port>
+        <Port type="audio" name="Audio 7/audio_in 1"/>
       </IO>
       <IO name="Audio 7" id="294" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 7/audio_out 1">
@@ -418,9 +405,7 @@
     </Route>
     <Route id="307" name="Audio 8" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=8:signal=8" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 8" id="325" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 8/audio_in 1">
-          <Connection other="system:capture_8"/>
-        </Port>
+        <Port type="audio" name="Audio 8/audio_in 1"/>
       </IO>
       <IO name="Audio 8" id="326" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 8/audio_out 1">
@@ -456,9 +441,7 @@
     </Route>
     <Route id="339" name="Audio 9" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=9:signal=9" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 9" id="357" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 9/audio_in 1">
-          <Connection other="system:capture_9"/>
-        </Port>
+        <Port type="audio" name="Audio 9/audio_in 1"/>
       </IO>
       <IO name="Audio 9" id="358" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 9/audio_out 1">
@@ -494,9 +477,7 @@
     </Route>
     <Route id="371" name="Audio 10" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=10:signal=10" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 10" id="389" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 10/audio_in 1">
-          <Connection other="system:capture_10"/>
-        </Port>
+        <Port type="audio" name="Audio 10/audio_in 1"/>
       </IO>
       <IO name="Audio 10" id="390" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 10/audio_out 1">
@@ -532,9 +513,7 @@
     </Route>
     <Route id="403" name="Audio 11" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=11:signal=11" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 11" id="421" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 11/audio_in 1">
-          <Connection other="system:capture_11"/>
-        </Port>
+        <Port type="audio" name="Audio 11/audio_in 1"/>
       </IO>
       <IO name="Audio 11" id="422" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 11/audio_out 1">
@@ -570,9 +549,7 @@
     </Route>
     <Route id="435" name="Audio 12" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=12:signal=12" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 12" id="453" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 12/audio_in 1">
-          <Connection other="system:capture_12"/>
-        </Port>
+        <Port type="audio" name="Audio 12/audio_in 1"/>
       </IO>
       <IO name="Audio 12" id="454" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 12/audio_out 1">
@@ -608,9 +585,7 @@
     </Route>
     <Route id="467" name="Audio 13" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=13:signal=13" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 13" id="485" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 13/audio_in 1">
-          <Connection other="system:capture_13"/>
-        </Port>
+        <Port type="audio" name="Audio 13/audio_in 1"/>
       </IO>
       <IO name="Audio 13" id="486" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 13/audio_out 1">
@@ -646,9 +621,7 @@
     </Route>
     <Route id="499" name="Audio 14" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=14:signal=14" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 14" id="517" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 14/audio_in 1">
-          <Connection other="system:capture_14"/>
-        </Port>
+        <Port type="audio" name="Audio 14/audio_in 1"/>
       </IO>
       <IO name="Audio 14" id="518" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 14/audio_out 1">
@@ -684,9 +657,7 @@
     </Route>
     <Route id="531" name="Audio 15" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=15:signal=15" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 15" id="549" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 15/audio_in 1">
-          <Connection other="system:capture_15"/>
-        </Port>
+        <Port type="audio" name="Audio 15/audio_in 1"/>
       </IO>
       <IO name="Audio 15" id="550" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 15/audio_out 1">
@@ -722,9 +693,7 @@
     </Route>
     <Route id="563" name="Audio 16" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=16:signal=16" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 16" id="581" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 16/audio_in 1">
-          <Connection other="system:capture_16"/>
-        </Port>
+        <Port type="audio" name="Audio 16/audio_in 1"/>
       </IO>
       <IO name="Audio 16" id="582" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 16/audio_out 1">
@@ -760,9 +729,7 @@
     </Route>
     <Route id="595" name="Audio 17" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=17:signal=17" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 17" id="613" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 17/audio_in 1">
-          <Connection other="system:capture_17"/>
-        </Port>
+        <Port type="audio" name="Audio 17/audio_in 1"/>
       </IO>
       <IO name="Audio 17" id="614" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 17/audio_out 1">
@@ -798,9 +765,7 @@
     </Route>
     <Route id="627" name="Audio 18" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=18:signal=18" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 18" id="645" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 18/audio_in 1">
-          <Connection other="system:capture_18"/>
-        </Port>
+        <Port type="audio" name="Audio 18/audio_in 1"/>
       </IO>
       <IO name="Audio 18" id="646" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 18/audio_out 1">
@@ -836,9 +801,7 @@
     </Route>
     <Route id="659" name="Audio 19" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=19:signal=19" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 19" id="677" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 19/audio_in 1">
-          <Connection other="system:capture_19"/>
-        </Port>
+        <Port type="audio" name="Audio 19/audio_in 1"/>
       </IO>
       <IO name="Audio 19" id="678" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 19/audio_out 1">
@@ -874,9 +837,7 @@
     </Route>
     <Route id="691" name="Audio 20" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=20:signal=20" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 20" id="709" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 20/audio_in 1">
-          <Connection other="system:capture_20"/>
-        </Port>
+        <Port type="audio" name="Audio 20/audio_in 1"/>
       </IO>
       <IO name="Audio 20" id="710" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 20/audio_out 1">
@@ -912,9 +873,7 @@
     </Route>
     <Route id="723" name="Audio 21" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=21:signal=21" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 21" id="741" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 21/audio_in 1">
-          <Connection other="system:capture_21"/>
-        </Port>
+        <Port type="audio" name="Audio 21/audio_in 1"/>
       </IO>
       <IO name="Audio 21" id="742" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 21/audio_out 1">
@@ -950,9 +909,7 @@
     </Route>
     <Route id="755" name="Audio 22" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=22:signal=22" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 22" id="773" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 22/audio_in 1">
-          <Connection other="system:capture_22"/>
-        </Port>
+        <Port type="audio" name="Audio 22/audio_in 1"/>
       </IO>
       <IO name="Audio 22" id="774" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 22/audio_out 1">
@@ -988,9 +945,7 @@
     </Route>
     <Route id="787" name="Audio 23" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=23:signal=23" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 23" id="805" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 23/audio_in 1">
-          <Connection other="system:capture_23"/>
-        </Port>
+        <Port type="audio" name="Audio 23/audio_in 1"/>
       </IO>
       <IO name="Audio 23" id="806" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 23/audio_out 1">
@@ -1026,9 +981,7 @@
     </Route>
     <Route id="819" name="Audio 24" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=24:signal=24" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 24" id="837" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 24/audio_in 1">
-          <Connection other="system:capture_24"/>
-        </Port>
+        <Port type="audio" name="Audio 24/audio_in 1"/>
       </IO>
       <IO name="Audio 24" id="838" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 24/audio_out 1">
@@ -1064,9 +1017,7 @@
     </Route>
     <Route id="851" name="Audio 25" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=25:signal=25" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 25" id="869" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 25/audio_in 1">
-          <Connection other="system:capture_25"/>
-        </Port>
+        <Port type="audio" name="Audio 25/audio_in 1"/>
       </IO>
       <IO name="Audio 25" id="870" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 25/audio_out 1">
@@ -1102,9 +1053,7 @@
     </Route>
     <Route id="883" name="Audio 26" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=26:signal=26" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 26" id="901" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 26/audio_in 1">
-          <Connection other="system:capture_26"/>
-        </Port>
+        <Port type="audio" name="Audio 26/audio_in 1"/>
       </IO>
       <IO name="Audio 26" id="902" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 26/audio_out 1">
@@ -1216,9 +1165,7 @@
     </Route>
     <Route id="979" name="Audio 29" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=29:signal=29" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 29" id="997" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 29/audio_in 1">
-          <Connection other="system:capture_3"/>
-        </Port>
+        <Port type="audio" name="Audio 29/audio_in 1"/>
       </IO>
       <IO name="Audio 29" id="998" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 29/audio_out 1">
@@ -1254,9 +1201,7 @@
     </Route>
     <Route id="1011" name="Audio 30" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=30:signal=30" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 30" id="1029" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 30/audio_in 1">
-          <Connection other="system:capture_4"/>
-        </Port>
+        <Port type="audio" name="Audio 30/audio_in 1"/>
       </IO>
       <IO name="Audio 30" id="1030" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 30/audio_out 1">
@@ -1292,9 +1237,7 @@
     </Route>
     <Route id="1043" name="Audio 31" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=31:signal=31" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 31" id="1061" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 31/audio_in 1">
-          <Connection other="system:capture_5"/>
-        </Port>
+        <Port type="audio" name="Audio 31/audio_in 1"/>
       </IO>
       <IO name="Audio 31" id="1062" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 31/audio_out 1">
@@ -1330,9 +1273,7 @@
     </Route>
     <Route id="1075" name="Audio 32" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=32:signal=32" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 32" id="1093" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 32/audio_in 1">
-          <Connection other="system:capture_6"/>
-        </Port>
+        <Port type="audio" name="Audio 32/audio_in 1"/>
       </IO>
       <IO name="Audio 32" id="1094" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 32/audio_out 1">
@@ -1368,38 +1309,38 @@
     </Route>
   </Routes>
   <Playlists>
-    <Playlist id="110" name="Audio 1.1" type="audio" orig-track-id="83" frozen="no" combine-ops="0"/>
     <Playlist id="142" name="Audio 2.1" type="audio" orig-track-id="115" frozen="no" combine-ops="0"/>
-    <Playlist id="174" name="Audio 3.1" type="audio" orig-track-id="147" frozen="no" combine-ops="0"/>
+    <Playlist id="110" name="Audio 1.1" type="audio" orig-track-id="83" frozen="no" combine-ops="0"/>
     <Playlist id="206" name="Audio 4.1" type="audio" orig-track-id="179" frozen="no" combine-ops="0"/>
-    <Playlist id="238" name="Audio 5.1" type="audio" orig-track-id="211" frozen="no" combine-ops="0"/>
+    <Playlist id="174" name="Audio 3.1" type="audio" orig-track-id="147" frozen="no" combine-ops="0"/>
     <Playlist id="270" name="Audio 6.1" type="audio" orig-track-id="243" frozen="no" combine-ops="0"/>
-    <Playlist id="302" name="Audio 7.1" type="audio" orig-track-id="275" frozen="no" combine-ops="0"/>
+    <Playlist id="238" name="Audio 5.1" type="audio" orig-track-id="211" frozen="no" combine-ops="0"/>
     <Playlist id="334" name="Audio 8.1" type="audio" orig-track-id="307" frozen="no" combine-ops="0"/>
-    <Playlist id="366" name="Audio 9.1" type="audio" orig-track-id="339" frozen="no" combine-ops="0"/>
+    <Playlist id="302" name="Audio 7.1" type="audio" orig-track-id="275" frozen="no" combine-ops="0"/>
     <Playlist id="398" name="Audio 10.1" type="audio" orig-track-id="371" frozen="no" combine-ops="0"/>
-    <Playlist id="430" name="Audio 11.1" type="audio" orig-track-id="403" frozen="no" combine-ops="0"/>
+    <Playlist id="366" name="Audio 9.1" type="audio" orig-track-id="339" frozen="no" combine-ops="0"/>
     <Playlist id="462" name="Audio 12.1" type="audio" orig-track-id="435" frozen="no" combine-ops="0"/>
-    <Playlist id="494" name="Audio 13.1" type="audio" orig-track-id="467" frozen="no" combine-ops="0"/>
+    <Playlist id="430" name="Audio 11.1" type="audio" orig-track-id="403" frozen="no" combine-ops="0"/>
     <Playlist id="526" name="Audio 14.1" type="audio" orig-track-id="499" frozen="no" combine-ops="0"/>
-    <Playlist id="558" name="Audio 15.1" type="audio" orig-track-id="531" frozen="no" combine-ops="0"/>
+    <Playlist id="494" name="Audio 13.1" type="audio" orig-track-id="467" frozen="no" combine-ops="0"/>
     <Playlist id="590" name="Audio 16.1" type="audio" orig-track-id="563" frozen="no" combine-ops="0"/>
-    <Playlist id="622" name="Audio 17.1" type="audio" orig-track-id="595" frozen="no" combine-ops="0"/>
+    <Playlist id="558" name="Audio 15.1" type="audio" orig-track-id="531" frozen="no" combine-ops="0"/>
     <Playlist id="654" name="Audio 18.1" type="audio" orig-track-id="627" frozen="no" combine-ops="0"/>
-    <Playlist id="686" name="Audio 19.1" type="audio" orig-track-id="659" frozen="no" combine-ops="0"/>
+    <Playlist id="622" name="Audio 17.1" type="audio" orig-track-id="595" frozen="no" combine-ops="0"/>
     <Playlist id="718" name="Audio 20.1" type="audio" orig-track-id="691" frozen="no" combine-ops="0"/>
-    <Playlist id="750" name="Audio 21.1" type="audio" orig-track-id="723" frozen="no" combine-ops="0"/>
+    <Playlist id="686" name="Audio 19.1" type="audio" orig-track-id="659" frozen="no" combine-ops="0"/>
     <Playlist id="782" name="Audio 22.1" type="audio" orig-track-id="755" frozen="no" combine-ops="0"/>
-    <Playlist id="814" name="Audio 23.1" type="audio" orig-track-id="787" frozen="no" combine-ops="0"/>
+    <Playlist id="750" name="Audio 21.1" type="audio" orig-track-id="723" frozen="no" combine-ops="0"/>
     <Playlist id="846" name="Audio 24.1" type="audio" orig-track-id="819" frozen="no" combine-ops="0"/>
-    <Playlist id="878" name="Audio 25.1" type="audio" orig-track-id="851" frozen="no" combine-ops="0"/>
+    <Playlist id="814" name="Audio 23.1" type="audio" orig-track-id="787" frozen="no" combine-ops="0"/>
     <Playlist id="910" name="Audio 26.1" type="audio" orig-track-id="883" frozen="no" combine-ops="0"/>
-    <Playlist id="942" name="Audio 27.1" type="audio" orig-track-id="915" frozen="no" combine-ops="0"/>
+    <Playlist id="878" name="Audio 25.1" type="audio" orig-track-id="851" frozen="no" combine-ops="0"/>
     <Playlist id="974" name="Audio 28.1" type="audio" orig-track-id="947" frozen="no" combine-ops="0"/>
-    <Playlist id="1006" name="Audio 29.1" type="audio" orig-track-id="979" frozen="no" combine-ops="0"/>
+    <Playlist id="942" name="Audio 27.1" type="audio" orig-track-id="915" frozen="no" combine-ops="0"/>
     <Playlist id="1038" name="Audio 30.1" type="audio" orig-track-id="1011" frozen="no" combine-ops="0"/>
-    <Playlist id="1070" name="Audio 31.1" type="audio" orig-track-id="1043" frozen="no" combine-ops="0"/>
+    <Playlist id="1006" name="Audio 29.1" type="audio" orig-track-id="979" frozen="no" combine-ops="0"/>
     <Playlist id="1102" name="Audio 32.1" type="audio" orig-track-id="1075" frozen="no" combine-ops="0"/>
+    <Playlist id="1070" name="Audio 31.1" type="audio" orig-track-id="1043" frozen="no" combine-ops="0"/>
   </Playlists>
   <UnusedPlaylists/>
   <RouteGroups/>
@@ -1412,6 +1353,9 @@
         <Connection other="system:playback_2"/>
       </Port>
     </IO>
+    <Processor id="2320" name="Amp" active="yes" user-latency="0" type="amp">
+      <Controllable name="gaincontrol" id="2322" flags="GainLike" value="1.000000000000"/>
+    </Processor>
   </Click>
   <NamedSelections/>
   <Speakers>
@@ -1424,8 +1368,10 @@
   </TempoMap>
   <ControlProtocols>
     <Protocol name="Open Sound Control (OSC)" active="no"/>
-    <Protocol name="Generic MIDI" active="no"/>
-    <Protocol name="Mackie" active="no"/>
+    <Protocol name="Generic MIDI" feedback="0" feedback-interval="10000" active="yes">
+      <Controls/>
+    </Protocol>
+    <Protocol name="Mackie" bank="0" ipmidi-base="21928" device-profile="" device-name="Mackie Control Universal Pro" active="yes"/>
   </ControlProtocols>
   <Extra>
     <UI>
diff --git a/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour.bak b/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour.bak
index 66adbab0a8..6794c67bc9 100644
--- a/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour.bak
+++ b/libs/ardour/test/profiling/sessions/32tracks/32tracks.ardour.bak
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Session version="3.0.0" name="32tracks" sample-rate="44100" id-counter="1107" event-counter="0">
+<Session version="3001" name="32tracks" sample-rate="44100" id-counter="2430" event-counter="0">
   <Config>
     <Option name="xfade-model" value="FullCrossfade"/>
+    <Option name="xfade-choice" value="ConstantPowerMinus3dB"/>
     <Option name="auto-xfade" value="1"/>
     <Option name="short-xfade-seconds" value="0.015"/>
-    <Option name="xfades-active" value="1"/>
-    <Option name="xfades-visible" value="1"/>
     <Option name="destructive-xfade-msecs" value="2"/>
     <Option name="use-region-fades" value="1"/>
     <Option name="show-region-fades" value="1"/>
@@ -21,8 +20,6 @@
     <Option name="raid-path" value=""/>
     <Option name="audio-search-path" value=""/>
     <Option name="midi-search-path" value=""/>
-    <Option name="bwf-country-code" value="US"/>
-    <Option name="bwf-organization-code" value="US"/>
     <Option name="auditioner-output-left" value="default"/>
     <Option name="auditioner-output-right" value="default"/>
     <Option name="timecode-source-is-synced" value="1"/>
@@ -52,72 +49,72 @@
     <Route id="22" name="master" default-type="audio" flags="MasterOut" active="yes" phase-invert="00" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=0:signal=0" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no">
       <IO name="master" id="39" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="master/audio_in 1">
-          <Connection other="Audio 32/audio_out 1"/>
-          <Connection other="Audio 31/audio_out 1"/>
-          <Connection other="Audio 30/audio_out 1"/>
-          <Connection other="Audio 29/audio_out 1"/>
-          <Connection other="Audio 28/audio_out 1"/>
-          <Connection other="Audio 27/audio_out 1"/>
-          <Connection other="Audio 26/audio_out 1"/>
-          <Connection other="Audio 25/audio_out 1"/>
-          <Connection other="Audio 24/audio_out 1"/>
-          <Connection other="Audio 23/audio_out 1"/>
-          <Connection other="Audio 22/audio_out 1"/>
-          <Connection other="Audio 21/audio_out 1"/>
-          <Connection other="Audio 20/audio_out 1"/>
-          <Connection other="Audio 19/audio_out 1"/>
-          <Connection other="Audio 18/audio_out 1"/>
-          <Connection other="Audio 17/audio_out 1"/>
-          <Connection other="Audio 16/audio_out 1"/>
-          <Connection other="Audio 15/audio_out 1"/>
-          <Connection other="Audio 14/audio_out 1"/>
-          <Connection other="Audio 13/audio_out 1"/>
-          <Connection other="Audio 12/audio_out 1"/>
-          <Connection other="Audio 11/audio_out 1"/>
-          <Connection other="Audio 10/audio_out 1"/>
-          <Connection other="Audio 9/audio_out 1"/>
-          <Connection other="Audio 8/audio_out 1"/>
-          <Connection other="Audio 7/audio_out 1"/>
-          <Connection other="Audio 6/audio_out 1"/>
-          <Connection other="Audio 5/audio_out 1"/>
-          <Connection other="Audio 4/audio_out 1"/>
-          <Connection other="Audio 3/audio_out 1"/>
-          <Connection other="Audio 2/audio_out 1"/>
           <Connection other="Audio 1/audio_out 1"/>
+          <Connection other="Audio 2/audio_out 1"/>
+          <Connection other="Audio 3/audio_out 1"/>
+          <Connection other="Audio 4/audio_out 1"/>
+          <Connection other="Audio 5/audio_out 1"/>
+          <Connection other="Audio 6/audio_out 1"/>
+          <Connection other="Audio 7/audio_out 1"/>
+          <Connection other="Audio 8/audio_out 1"/>
+          <Connection other="Audio 9/audio_out 1"/>
+          <Connection other="Audio 10/audio_out 1"/>
+          <Connection other="Audio 11/audio_out 1"/>
+          <Connection other="Audio 12/audio_out 1"/>
+          <Connection other="Audio 13/audio_out 1"/>
+          <Connection other="Audio 14/audio_out 1"/>
+          <Connection other="Audio 15/audio_out 1"/>
+          <Connection other="Audio 16/audio_out 1"/>
+          <Connection other="Audio 17/audio_out 1"/>
+          <Connection other="Audio 18/audio_out 1"/>
+          <Connection other="Audio 19/audio_out 1"/>
+          <Connection other="Audio 20/audio_out 1"/>
+          <Connection other="Audio 21/audio_out 1"/>
+          <Connection other="Audio 22/audio_out 1"/>
+          <Connection other="Audio 23/audio_out 1"/>
+          <Connection other="Audio 24/audio_out 1"/>
+          <Connection other="Audio 25/audio_out 1"/>
+          <Connection other="Audio 26/audio_out 1"/>
+          <Connection other="Audio 27/audio_out 1"/>
+          <Connection other="Audio 28/audio_out 1"/>
+          <Connection other="Audio 29/audio_out 1"/>
+          <Connection other="Audio 30/audio_out 1"/>
+          <Connection other="Audio 31/audio_out 1"/>
+          <Connection other="Audio 32/audio_out 1"/>
         </Port>
         <Port type="audio" name="master/audio_in 2">
-          <Connection other="Audio 32/audio_out 2"/>
-          <Connection other="Audio 31/audio_out 2"/>
-          <Connection other="Audio 30/audio_out 2"/>
-          <Connection other="Audio 29/audio_out 2"/>
-          <Connection other="Audio 28/audio_out 2"/>
-          <Connection other="Audio 27/audio_out 2"/>
-          <Connection other="Audio 26/audio_out 2"/>
-          <Connection other="Audio 25/audio_out 2"/>
-          <Connection other="Audio 24/audio_out 2"/>
-          <Connection other="Audio 23/audio_out 2"/>
-          <Connection other="Audio 22/audio_out 2"/>
-          <Connection other="Audio 21/audio_out 2"/>
-          <Connection other="Audio 20/audio_out 2"/>
-          <Connection other="Audio 19/audio_out 2"/>
-          <Connection other="Audio 18/audio_out 2"/>
-          <Connection other="Audio 17/audio_out 2"/>
-          <Connection other="Audio 16/audio_out 2"/>
-          <Connection other="Audio 15/audio_out 2"/>
-          <Connection other="Audio 14/audio_out 2"/>
-          <Connection other="Audio 13/audio_out 2"/>
-          <Connection other="Audio 12/audio_out 2"/>
-          <Connection other="Audio 11/audio_out 2"/>
-          <Connection other="Audio 10/audio_out 2"/>
-          <Connection other="Audio 9/audio_out 2"/>
-          <Connection other="Audio 8/audio_out 2"/>
-          <Connection other="Audio 7/audio_out 2"/>
-          <Connection other="Audio 6/audio_out 2"/>
-          <Connection other="Audio 5/audio_out 2"/>
-          <Connection other="Audio 4/audio_out 2"/>
-          <Connection other="Audio 3/audio_out 2"/>
-          <Connection other="Audio 2/audio_out 2"/>
           <Connection other="Audio 1/audio_out 2"/>
+          <Connection other="Audio 2/audio_out 2"/>
+          <Connection other="Audio 3/audio_out 2"/>
+          <Connection other="Audio 4/audio_out 2"/>
+          <Connection other="Audio 5/audio_out 2"/>
+          <Connection other="Audio 6/audio_out 2"/>
+          <Connection other="Audio 7/audio_out 2"/>
+          <Connection other="Audio 8/audio_out 2"/>
+          <Connection other="Audio 9/audio_out 2"/>
+          <Connection other="Audio 10/audio_out 2"/>
+          <Connection other="Audio 11/audio_out 2"/>
+          <Connection other="Audio 12/audio_out 2"/>
+          <Connection other="Audio 13/audio_out 2"/>
+          <Connection other="Audio 14/audio_out 2"/>
+          <Connection other="Audio 15/audio_out 2"/>
+          <Connection other="Audio 16/audio_out 2"/>
+          <Connection other="Audio 17/audio_out 2"/>
+          <Connection other="Audio 18/audio_out 2"/>
+          <Connection other="Audio 19/audio_out 2"/>
+          <Connection other="Audio 20/audio_out 2"/>
+          <Connection other="Audio 21/audio_out 2"/>
+          <Connection other="Audio 22/audio_out 2"/>
+          <Connection other="Audio 23/audio_out 2"/>
+          <Connection other="Audio 24/audio_out 2"/>
+          <Connection other="Audio 25/audio_out 2"/>
+          <Connection other="Audio 26/audio_out 2"/>
+          <Connection other="Audio 27/audio_out 2"/>
+          <Connection other="Audio 28/audio_out 2"/>
+          <Connection other="Audio 29/audio_out 2"/>
+          <Connection other="Audio 30/audio_out 2"/>
+          <Connection other="Audio 31/audio_out 2"/>
+          <Connection other="Audio 32/audio_out 2"/>
         </Port>
       </IO>
       <IO name="master" id="40" direction="Output" default-type="audio" user-latency="0">
@@ -150,7 +147,7 @@
         </PannerShell>
       </Processor>
     </Route>
-    <Route id="83" name="Audio 1" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=2" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="83" name="Audio 1" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=1:signal=1" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 1" id="101" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 1/audio_in 1">
           <Connection other="system:capture_1"/>
@@ -188,7 +185,7 @@
       <Controllable name="recenable" id="85" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 1.1" name="Audio 1" id="109" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="115" name="Audio 2" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=3" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="115" name="Audio 2" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=2:signal=2" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 2" id="133" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 2/audio_in 1">
           <Connection other="system:capture_2"/>
@@ -226,11 +223,9 @@
       <Controllable name="recenable" id="117" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 2.1" name="Audio 2" id="141" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="147" name="Audio 3" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=4" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="147" name="Audio 3" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=3:signal=3" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 3" id="165" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 3/audio_in 1">
-          <Connection other="system:capture_3"/>
-        </Port>
+        <Port type="audio" name="Audio 3/audio_in 1"/>
       </IO>
       <IO name="Audio 3" id="166" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 3/audio_out 1">
@@ -264,11 +259,9 @@
       <Controllable name="recenable" id="149" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 3.1" name="Audio 3" id="173" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="179" name="Audio 4" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=5" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="179" name="Audio 4" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=4:signal=4" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 4" id="197" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 4/audio_in 1">
-          <Connection other="system:capture_4"/>
-        </Port>
+        <Port type="audio" name="Audio 4/audio_in 1"/>
       </IO>
       <IO name="Audio 4" id="198" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 4/audio_out 1">
@@ -302,11 +295,9 @@
       <Controllable name="recenable" id="181" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 4.1" name="Audio 4" id="205" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="211" name="Audio 5" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=6" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="211" name="Audio 5" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=5:signal=5" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 5" id="229" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 5/audio_in 1">
-          <Connection other="system:capture_5"/>
-        </Port>
+        <Port type="audio" name="Audio 5/audio_in 1"/>
       </IO>
       <IO name="Audio 5" id="230" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 5/audio_out 1">
@@ -340,11 +331,9 @@
       <Controllable name="recenable" id="213" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 5.1" name="Audio 5" id="237" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="243" name="Audio 6" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=7" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="243" name="Audio 6" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=6:signal=6" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 6" id="261" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 6/audio_in 1">
-          <Connection other="system:capture_6"/>
-        </Port>
+        <Port type="audio" name="Audio 6/audio_in 1"/>
       </IO>
       <IO name="Audio 6" id="262" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 6/audio_out 1">
@@ -378,11 +367,9 @@
       <Controllable name="recenable" id="245" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 6.1" name="Audio 6" id="269" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="275" name="Audio 7" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=8" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="275" name="Audio 7" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=7:signal=7" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 7" id="293" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 7/audio_in 1">
-          <Connection other="system:capture_7"/>
-        </Port>
+        <Port type="audio" name="Audio 7/audio_in 1"/>
       </IO>
       <IO name="Audio 7" id="294" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 7/audio_out 1">
@@ -416,11 +403,9 @@
       <Controllable name="recenable" id="277" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 7.1" name="Audio 7" id="301" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="307" name="Audio 8" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=9" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="307" name="Audio 8" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=8:signal=8" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 8" id="325" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 8/audio_in 1">
-          <Connection other="system:capture_8"/>
-        </Port>
+        <Port type="audio" name="Audio 8/audio_in 1"/>
       </IO>
       <IO name="Audio 8" id="326" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 8/audio_out 1">
@@ -454,11 +439,9 @@
       <Controllable name="recenable" id="309" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 8.1" name="Audio 8" id="333" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="339" name="Audio 9" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=10" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="339" name="Audio 9" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=9:signal=9" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 9" id="357" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 9/audio_in 1">
-          <Connection other="system:capture_9"/>
-        </Port>
+        <Port type="audio" name="Audio 9/audio_in 1"/>
       </IO>
       <IO name="Audio 9" id="358" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 9/audio_out 1">
@@ -492,11 +475,9 @@
       <Controllable name="recenable" id="341" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 9.1" name="Audio 9" id="365" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="371" name="Audio 10" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=11" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="371" name="Audio 10" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=10:signal=10" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 10" id="389" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 10/audio_in 1">
-          <Connection other="system:capture_10"/>
-        </Port>
+        <Port type="audio" name="Audio 10/audio_in 1"/>
       </IO>
       <IO name="Audio 10" id="390" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 10/audio_out 1">
@@ -530,11 +511,9 @@
       <Controllable name="recenable" id="373" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 10.1" name="Audio 10" id="397" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="403" name="Audio 11" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=12" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="403" name="Audio 11" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=11:signal=11" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 11" id="421" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 11/audio_in 1">
-          <Connection other="system:capture_11"/>
-        </Port>
+        <Port type="audio" name="Audio 11/audio_in 1"/>
       </IO>
       <IO name="Audio 11" id="422" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 11/audio_out 1">
@@ -568,11 +547,9 @@
       <Controllable name="recenable" id="405" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 11.1" name="Audio 11" id="429" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="435" name="Audio 12" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=13" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="435" name="Audio 12" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=12:signal=12" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 12" id="453" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 12/audio_in 1">
-          <Connection other="system:capture_12"/>
-        </Port>
+        <Port type="audio" name="Audio 12/audio_in 1"/>
       </IO>
       <IO name="Audio 12" id="454" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 12/audio_out 1">
@@ -606,11 +583,9 @@
       <Controllable name="recenable" id="437" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 12.1" name="Audio 12" id="461" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="467" name="Audio 13" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=14" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="467" name="Audio 13" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=13:signal=13" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 13" id="485" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 13/audio_in 1">
-          <Connection other="system:capture_13"/>
-        </Port>
+        <Port type="audio" name="Audio 13/audio_in 1"/>
       </IO>
       <IO name="Audio 13" id="486" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 13/audio_out 1">
@@ -644,11 +619,9 @@
       <Controllable name="recenable" id="469" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 13.1" name="Audio 13" id="493" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="499" name="Audio 14" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=15" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="499" name="Audio 14" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=14:signal=14" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 14" id="517" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 14/audio_in 1">
-          <Connection other="system:capture_14"/>
-        </Port>
+        <Port type="audio" name="Audio 14/audio_in 1"/>
       </IO>
       <IO name="Audio 14" id="518" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 14/audio_out 1">
@@ -682,11 +655,9 @@
       <Controllable name="recenable" id="501" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 14.1" name="Audio 14" id="525" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="531" name="Audio 15" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=16" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="531" name="Audio 15" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=15:signal=15" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 15" id="549" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 15/audio_in 1">
-          <Connection other="system:capture_15"/>
-        </Port>
+        <Port type="audio" name="Audio 15/audio_in 1"/>
       </IO>
       <IO name="Audio 15" id="550" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 15/audio_out 1">
@@ -720,11 +691,9 @@
       <Controllable name="recenable" id="533" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 15.1" name="Audio 15" id="557" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="563" name="Audio 16" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=17" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="563" name="Audio 16" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=16:signal=16" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 16" id="581" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 16/audio_in 1">
-          <Connection other="system:capture_16"/>
-        </Port>
+        <Port type="audio" name="Audio 16/audio_in 1"/>
       </IO>
       <IO name="Audio 16" id="582" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 16/audio_out 1">
@@ -758,11 +727,9 @@
       <Controllable name="recenable" id="565" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 16.1" name="Audio 16" id="589" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="595" name="Audio 17" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=18" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="595" name="Audio 17" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=17:signal=17" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 17" id="613" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 17/audio_in 1">
-          <Connection other="system:capture_17"/>
-        </Port>
+        <Port type="audio" name="Audio 17/audio_in 1"/>
       </IO>
       <IO name="Audio 17" id="614" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 17/audio_out 1">
@@ -796,11 +763,9 @@
       <Controllable name="recenable" id="597" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 17.1" name="Audio 17" id="621" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="627" name="Audio 18" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=19" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="627" name="Audio 18" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=18:signal=18" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 18" id="645" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 18/audio_in 1">
-          <Connection other="system:capture_18"/>
-        </Port>
+        <Port type="audio" name="Audio 18/audio_in 1"/>
       </IO>
       <IO name="Audio 18" id="646" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 18/audio_out 1">
@@ -834,11 +799,9 @@
       <Controllable name="recenable" id="629" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 18.1" name="Audio 18" id="653" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="659" name="Audio 19" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=20" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="659" name="Audio 19" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=19:signal=19" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 19" id="677" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 19/audio_in 1">
-          <Connection other="system:capture_19"/>
-        </Port>
+        <Port type="audio" name="Audio 19/audio_in 1"/>
       </IO>
       <IO name="Audio 19" id="678" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 19/audio_out 1">
@@ -872,11 +835,9 @@
       <Controllable name="recenable" id="661" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 19.1" name="Audio 19" id="685" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="691" name="Audio 20" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=21" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="691" name="Audio 20" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=20:signal=20" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 20" id="709" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 20/audio_in 1">
-          <Connection other="system:capture_20"/>
-        </Port>
+        <Port type="audio" name="Audio 20/audio_in 1"/>
       </IO>
       <IO name="Audio 20" id="710" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 20/audio_out 1">
@@ -910,11 +871,9 @@
       <Controllable name="recenable" id="693" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 20.1" name="Audio 20" id="717" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="723" name="Audio 21" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=22" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="723" name="Audio 21" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=21:signal=21" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 21" id="741" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 21/audio_in 1">
-          <Connection other="system:capture_21"/>
-        </Port>
+        <Port type="audio" name="Audio 21/audio_in 1"/>
       </IO>
       <IO name="Audio 21" id="742" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 21/audio_out 1">
@@ -948,11 +907,9 @@
       <Controllable name="recenable" id="725" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 21.1" name="Audio 21" id="749" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="755" name="Audio 22" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=23" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="755" name="Audio 22" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=22:signal=22" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 22" id="773" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 22/audio_in 1">
-          <Connection other="system:capture_22"/>
-        </Port>
+        <Port type="audio" name="Audio 22/audio_in 1"/>
       </IO>
       <IO name="Audio 22" id="774" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 22/audio_out 1">
@@ -986,11 +943,9 @@
       <Controllable name="recenable" id="757" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 22.1" name="Audio 22" id="781" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="787" name="Audio 23" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=24" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="787" name="Audio 23" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=23:signal=23" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 23" id="805" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 23/audio_in 1">
-          <Connection other="system:capture_23"/>
-        </Port>
+        <Port type="audio" name="Audio 23/audio_in 1"/>
       </IO>
       <IO name="Audio 23" id="806" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 23/audio_out 1">
@@ -1024,11 +979,9 @@
       <Controllable name="recenable" id="789" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 23.1" name="Audio 23" id="813" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="819" name="Audio 24" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=25" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="819" name="Audio 24" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=24:signal=24" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 24" id="837" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 24/audio_in 1">
-          <Connection other="system:capture_24"/>
-        </Port>
+        <Port type="audio" name="Audio 24/audio_in 1"/>
       </IO>
       <IO name="Audio 24" id="838" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 24/audio_out 1">
@@ -1062,11 +1015,9 @@
       <Controllable name="recenable" id="821" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 24.1" name="Audio 24" id="845" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="851" name="Audio 25" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=26" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="851" name="Audio 25" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=25:signal=25" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 25" id="869" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 25/audio_in 1">
-          <Connection other="system:capture_25"/>
-        </Port>
+        <Port type="audio" name="Audio 25/audio_in 1"/>
       </IO>
       <IO name="Audio 25" id="870" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 25/audio_out 1">
@@ -1100,11 +1051,9 @@
       <Controllable name="recenable" id="853" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 25.1" name="Audio 25" id="877" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="883" name="Audio 26" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=27" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="883" name="Audio 26" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=26:signal=26" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 26" id="901" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 26/audio_in 1">
-          <Connection other="system:capture_26"/>
-        </Port>
+        <Port type="audio" name="Audio 26/audio_in 1"/>
       </IO>
       <IO name="Audio 26" id="902" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 26/audio_out 1">
@@ -1138,7 +1087,7 @@
       <Controllable name="recenable" id="885" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 26.1" name="Audio 26" id="909" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="915" name="Audio 27" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=28" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="915" name="Audio 27" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=27:signal=27" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 27" id="933" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 27/audio_in 1">
           <Connection other="system:capture_1"/>
@@ -1176,7 +1125,7 @@
       <Controllable name="recenable" id="917" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 27.1" name="Audio 27" id="941" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="947" name="Audio 28" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=29" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="947" name="Audio 28" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=28:signal=28" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 28" id="965" direction="Input" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 28/audio_in 1">
           <Connection other="system:capture_2"/>
@@ -1214,11 +1163,9 @@
       <Controllable name="recenable" id="949" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 28.1" name="Audio 28" id="973" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="979" name="Audio 29" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=30" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="979" name="Audio 29" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=29:signal=29" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 29" id="997" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 29/audio_in 1">
-          <Connection other="system:capture_3"/>
-        </Port>
+        <Port type="audio" name="Audio 29/audio_in 1"/>
       </IO>
       <IO name="Audio 29" id="998" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 29/audio_out 1">
@@ -1252,11 +1199,9 @@
       <Controllable name="recenable" id="981" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 29.1" name="Audio 29" id="1005" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="1011" name="Audio 30" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=31" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="1011" name="Audio 30" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=30:signal=30" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 30" id="1029" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 30/audio_in 1">
-          <Connection other="system:capture_4"/>
-        </Port>
+        <Port type="audio" name="Audio 30/audio_in 1"/>
       </IO>
       <IO name="Audio 30" id="1030" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 30/audio_out 1">
@@ -1290,11 +1235,9 @@
       <Controllable name="recenable" id="1013" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 30.1" name="Audio 30" id="1037" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="1043" name="Audio 31" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=32" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="1043" name="Audio 31" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=31:signal=31" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 31" id="1061" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 31/audio_in 1">
-          <Connection other="system:capture_5"/>
-        </Port>
+        <Port type="audio" name="Audio 31/audio_in 1"/>
       </IO>
       <IO name="Audio 31" id="1062" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 31/audio_out 1">
@@ -1328,11 +1271,9 @@
       <Controllable name="recenable" id="1045" flags="" value="0.000000000000"/>
       <Diskstream flags="Recordable" playlist="Audio 31.1" name="Audio 31" id="1069" speed="1.000000" capture-alignment="Automatic" channels="1"/>
     </Route>
-    <Route id="1075" name="Audio 32" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=33" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
+    <Route id="1075" name="Audio 32" default-type="audio" active="yes" phase-invert="0" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=32:signal=32" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" mode="Normal">
       <IO name="Audio 32" id="1093" direction="Input" default-type="audio" user-latency="0">
-        <Port type="audio" name="Audio 32/audio_in 1">
-          <Connection other="system:capture_6"/>
-        </Port>
+        <Port type="audio" name="Audio 32/audio_in 1"/>
       </IO>
       <IO name="Audio 32" id="1094" direction="Output" default-type="audio" user-latency="0">
         <Port type="audio" name="Audio 32/audio_out 1">
@@ -1368,38 +1309,38 @@
     </Route>
   </Routes>
   <Playlists>
-    <Playlist id="110" name="Audio 1.1" type="audio" orig-track-id="83" frozen="no" combine-ops="0"/>
     <Playlist id="142" name="Audio 2.1" type="audio" orig-track-id="115" frozen="no" combine-ops="0"/>
-    <Playlist id="174" name="Audio 3.1" type="audio" orig-track-id="147" frozen="no" combine-ops="0"/>
+    <Playlist id="110" name="Audio 1.1" type="audio" orig-track-id="83" frozen="no" combine-ops="0"/>
     <Playlist id="206" name="Audio 4.1" type="audio" orig-track-id="179" frozen="no" combine-ops="0"/>
-    <Playlist id="238" name="Audio 5.1" type="audio" orig-track-id="211" frozen="no" combine-ops="0"/>
+    <Playlist id="174" name="Audio 3.1" type="audio" orig-track-id="147" frozen="no" combine-ops="0"/>
     <Playlist id="270" name="Audio 6.1" type="audio" orig-track-id="243" frozen="no" combine-ops="0"/>
-    <Playlist id="302" name="Audio 7.1" type="audio" orig-track-id="275" frozen="no" combine-ops="0"/>
+    <Playlist id="238" name="Audio 5.1" type="audio" orig-track-id="211" frozen="no" combine-ops="0"/>
     <Playlist id="334" name="Audio 8.1" type="audio" orig-track-id="307" frozen="no" combine-ops="0"/>
-    <Playlist id="366" name="Audio 9.1" type="audio" orig-track-id="339" frozen="no" combine-ops="0"/>
+    <Playlist id="302" name="Audio 7.1" type="audio" orig-track-id="275" frozen="no" combine-ops="0"/>
     <Playlist id="398" name="Audio 10.1" type="audio" orig-track-id="371" frozen="no" combine-ops="0"/>
-    <Playlist id="430" name="Audio 11.1" type="audio" orig-track-id="403" frozen="no" combine-ops="0"/>
+    <Playlist id="366" name="Audio 9.1" type="audio" orig-track-id="339" frozen="no" combine-ops="0"/>
     <Playlist id="462" name="Audio 12.1" type="audio" orig-track-id="435" frozen="no" combine-ops="0"/>
-    <Playlist id="494" name="Audio 13.1" type="audio" orig-track-id="467" frozen="no" combine-ops="0"/>
+    <Playlist id="430" name="Audio 11.1" type="audio" orig-track-id="403" frozen="no" combine-ops="0"/>
     <Playlist id="526" name="Audio 14.1" type="audio" orig-track-id="499" frozen="no" combine-ops="0"/>
-    <Playlist id="558" name="Audio 15.1" type="audio" orig-track-id="531" frozen="no" combine-ops="0"/>
+    <Playlist id="494" name="Audio 13.1" type="audio" orig-track-id="467" frozen="no" combine-ops="0"/>
     <Playlist id="590" name="Audio 16.1" type="audio" orig-track-id="563" frozen="no" combine-ops="0"/>
-    <Playlist id="622" name="Audio 17.1" type="audio" orig-track-id="595" frozen="no" combine-ops="0"/>
+    <Playlist id="558" name="Audio 15.1" type="audio" orig-track-id="531" frozen="no" combine-ops="0"/>
     <Playlist id="654" name="Audio 18.1" type="audio" orig-track-id="627" frozen="no" combine-ops="0"/>
-    <Playlist id="686" name="Audio 19.1" type="audio" orig-track-id="659" frozen="no" combine-ops="0"/>
+    <Playlist id="622" name="Audio 17.1" type="audio" orig-track-id="595" frozen="no" combine-ops="0"/>
     <Playlist id="718" name="Audio 20.1" type="audio" orig-track-id="691" frozen="no" combine-ops="0"/>
-    <Playlist id="750" name="Audio 21.1" type="audio" orig-track-id="723" frozen="no" combine-ops="0"/>
+    <Playlist id="686" name="Audio 19.1" type="audio" orig-track-id="659" frozen="no" combine-ops="0"/>
     <Playlist id="782" name="Audio 22.1" type="audio" orig-track-id="755" frozen="no" combine-ops="0"/>
-    <Playlist id="814" name="Audio 23.1" type="audio" orig-track-id="787" frozen="no" combine-ops="0"/>
+    <Playlist id="750" name="Audio 21.1" type="audio" orig-track-id="723" frozen="no" combine-ops="0"/>
     <Playlist id="846" name="Audio 24.1" type="audio" orig-track-id="819" frozen="no" combine-ops="0"/>
-    <Playlist id="878" name="Audio 25.1" type="audio" orig-track-id="851" frozen="no" combine-ops="0"/>
+    <Playlist id="814" name="Audio 23.1" type="audio" orig-track-id="787" frozen="no" combine-ops="0"/>
     <Playlist id="910" name="Audio 26.1" type="audio" orig-track-id="883" frozen="no" combine-ops="0"/>
-    <Playlist id="942" name="Audio 27.1" type="audio" orig-track-id="915" frozen="no" combine-ops="0"/>
+    <Playlist id="878" name="Audio 25.1" type="audio" orig-track-id="851" frozen="no" combine-ops="0"/>
     <Playlist id="974" name="Audio 28.1" type="audio" orig-track-id="947" frozen="no" combine-ops="0"/>
-    <Playlist id="1006" name="Audio 29.1" type="audio" orig-track-id="979" frozen="no" combine-ops="0"/>
+    <Playlist id="942" name="Audio 27.1" type="audio" orig-track-id="915" frozen="no" combine-ops="0"/>
     <Playlist id="1038" name="Audio 30.1" type="audio" orig-track-id="1011" frozen="no" combine-ops="0"/>
-    <Playlist id="1070" name="Audio 31.1" type="audio" orig-track-id="1043" frozen="no" combine-ops="0"/>
+    <Playlist id="1006" name="Audio 29.1" type="audio" orig-track-id="979" frozen="no" combine-ops="0"/>
     <Playlist id="1102" name="Audio 32.1" type="audio" orig-track-id="1075" frozen="no" combine-ops="0"/>
+    <Playlist id="1070" name="Audio 31.1" type="audio" orig-track-id="1043" frozen="no" combine-ops="0"/>
   </Playlists>
   <UnusedPlaylists/>
   <RouteGroups/>
@@ -1412,6 +1353,9 @@
         <Connection other="system:playback_2"/>
       </Port>
     </IO>
+    <Processor id="2320" name="Amp" active="yes" user-latency="0" type="amp">
+      <Controllable name="gaincontrol" id="2322" flags="GainLike" value="1.000000000000"/>
+    </Processor>
   </Click>
   <NamedSelections/>
   <Speakers>
@@ -1424,7 +1368,349 @@
   </TempoMap>
   <ControlProtocols>
     <Protocol name="Open Sound Control (OSC)" active="no"/>
-    <Protocol name="Generic MIDI" active="no"/>
-    <Protocol name="Mackie" active="no"/>
+    <Protocol name="Generic MIDI" feedback="0" feedback-interval="10000" active="yes">
+      <Controls/>
+    </Protocol>
+    <Protocol name="Mackie" bank="0" ipmidi-base="21928" device-profile="" device-name="Mackie Control Universal Pro" active="yes"/>
   </ControlProtocols>
+  <Extra>
+    <UI>
+      <Window name="R-22-41" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="R-22-44" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="R-22-45" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-22-41" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-22-44" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-22-45" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-83-103" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-83-106" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-83-107" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-115-135" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-115-138" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-115-139" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-147-167" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-147-170" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-147-171" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-179-199" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-179-202" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-179-203" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-211-231" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-211-234" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-211-235" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-243-263" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-243-266" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-243-267" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-275-295" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-275-298" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-275-299" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-307-327" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-307-330" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-307-331" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-339-359" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-339-362" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-339-363" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-371-391" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-371-394" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-371-395" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-403-423" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-403-426" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-403-427" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-435-455" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-435-458" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-435-459" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-467-487" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-467-490" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-467-491" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-499-519" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-499-522" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-499-523" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-531-551" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-531-554" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-531-555" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-563-583" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-563-586" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-563-587" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-595-615" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-595-618" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-595-619" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-627-647" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-627-650" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-627-651" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-659-679" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-659-682" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-659-683" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-691-711" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-691-714" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-691-715" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-723-743" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-723-746" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-723-747" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-755-775" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-755-778" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-755-779" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-787-807" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-787-810" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-787-811" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-819-839" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-819-842" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-819-843" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-851-871" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-851-874" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-851-875" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-883-903" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-883-906" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-883-907" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-915-935" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-915-938" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-915-939" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-947-967" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-947-970" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-947-971" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-979-999" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-979-1002" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-979-1003" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1011-1031" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1011-1034" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1011-1035" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1043-1063" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1043-1066" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1043-1067" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1075-1095" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1075-1098" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <Window name="M-1075-1099" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
+      <GUIObjectState>
+        <Object id="route 22" color="28156:3060:40485"/>
+        <Object id="rtav 22" height="60" visible="1"/>
+        <Object id="automation 43" height="60" visible="0"/>
+        <Object id="automation 30" height="60" visible="0"/>
+        <Object id="automation 34" height="60" visible="0"/>
+        <Object id="strip 22" visible="1" strip-width="Wide">
+          <Object id="processor 41"/>
+        </Object>
+        <Object id="route 83" color="41214:6238:37268"/>
+        <Object id="rtav 83" height="60" visible="1"/>
+        <Object id="automation 105" height="60" visible="0"/>
+        <Object id="automation 92" height="60" visible="0"/>
+        <Object id="route 115" color="30107:2538:43272"/>
+        <Object id="rtav 115" height="60" visible="1"/>
+        <Object id="automation 137" height="60" visible="0"/>
+        <Object id="automation 124" height="60" visible="0"/>
+        <Object id="route 147" color="45907:43976:29990"/>
+        <Object id="rtav 147" height="60" visible="1"/>
+        <Object id="automation 169" height="60" visible="0"/>
+        <Object id="automation 156" height="60" visible="0"/>
+        <Object id="route 179" color="28824:2764:526"/>
+        <Object id="rtav 179" height="60" visible="1"/>
+        <Object id="automation 201" height="60" visible="0"/>
+        <Object id="automation 188" height="60" visible="0"/>
+        <Object id="route 211" color="3188:10144:2761"/>
+        <Object id="rtav 211" height="60" visible="1"/>
+        <Object id="automation 233" height="60" visible="0"/>
+        <Object id="automation 220" height="60" visible="0"/>
+        <Object id="route 243" color="8803:25061:18421"/>
+        <Object id="rtav 243" height="60" visible="1"/>
+        <Object id="automation 265" height="60" visible="0"/>
+        <Object id="automation 252" height="60" visible="0"/>
+        <Object id="route 275" color="45836:4494:3812"/>
+        <Object id="rtav 275" height="60" visible="1"/>
+        <Object id="automation 297" height="60" visible="0"/>
+        <Object id="automation 284" height="60" visible="0"/>
+        <Object id="route 307" color="45754:9969:15307"/>
+        <Object id="rtav 307" height="60" visible="1"/>
+        <Object id="automation 329" height="60" visible="0"/>
+        <Object id="automation 316" height="60" visible="0"/>
+        <Object id="route 339" color="34367:13830:24287"/>
+        <Object id="rtav 339" height="60" visible="1"/>
+        <Object id="automation 361" height="60" visible="0"/>
+        <Object id="automation 348" height="60" visible="0"/>
+        <Object id="route 371" color="37491:9780:8407"/>
+        <Object id="rtav 371" height="60" visible="1"/>
+        <Object id="automation 393" height="60" visible="0"/>
+        <Object id="automation 380" height="60" visible="0"/>
+        <Object id="route 403" color="12158:35400:1621"/>
+        <Object id="rtav 403" height="60" visible="1"/>
+        <Object id="automation 425" height="60" visible="0"/>
+        <Object id="automation 412" height="60" visible="0"/>
+        <Object id="route 435" color="6748:19025:20080"/>
+        <Object id="rtav 435" height="60" visible="1"/>
+        <Object id="automation 457" height="60" visible="0"/>
+        <Object id="automation 444" height="60" visible="0"/>
+        <Object id="route 467" color="45639:1015:17987"/>
+        <Object id="rtav 467" height="60" visible="1"/>
+        <Object id="automation 489" height="60" visible="0"/>
+        <Object id="automation 476" height="60" visible="0"/>
+        <Object id="route 499" color="41615:1541:46811"/>
+        <Object id="rtav 499" height="60" visible="1"/>
+        <Object id="automation 521" height="60" visible="0"/>
+        <Object id="automation 508" height="60" visible="0"/>
+        <Object id="route 531" color="44379:40654:38351"/>
+        <Object id="rtav 531" height="60" visible="1"/>
+        <Object id="automation 553" height="60" visible="0"/>
+        <Object id="automation 540" height="60" visible="0"/>
+        <Object id="route 563" color="42876:47427:47155"/>
+        <Object id="rtav 563" height="60" visible="1"/>
+        <Object id="automation 585" height="60" visible="0"/>
+        <Object id="automation 572" height="60" visible="0"/>
+        <Object id="route 595" color="8289:3239:44991"/>
+        <Object id="rtav 595" height="60" visible="1"/>
+        <Object id="automation 617" height="60" visible="0"/>
+        <Object id="automation 604" height="60" visible="0"/>
+        <Object id="route 627" color="12783:18546:42745"/>
+        <Object id="rtav 627" height="60" visible="1"/>
+        <Object id="automation 649" height="60" visible="0"/>
+        <Object id="automation 636" height="60" visible="0"/>
+        <Object id="route 659" color="11104:31186:29113"/>
+        <Object id="rtav 659" height="60" visible="1"/>
+        <Object id="automation 681" height="60" visible="0"/>
+        <Object id="automation 668" height="60" visible="0"/>
+        <Object id="route 691" color="24934:39593:18604"/>
+        <Object id="rtav 691" height="60" visible="1"/>
+        <Object id="automation 713" height="60" visible="0"/>
+        <Object id="automation 700" height="60" visible="0"/>
+        <Object id="route 723" color="23066:29567:19114"/>
+        <Object id="rtav 723" height="60" visible="1"/>
+        <Object id="automation 745" height="60" visible="0"/>
+        <Object id="automation 732" height="60" visible="0"/>
+        <Object id="route 755" color="10467:1647:25863"/>
+        <Object id="rtav 755" height="60" visible="1"/>
+        <Object id="automation 777" height="60" visible="0"/>
+        <Object id="automation 764" height="60" visible="0"/>
+        <Object id="route 787" color="29492:19635:23502"/>
+        <Object id="rtav 787" height="60" visible="1"/>
+        <Object id="automation 809" height="60" visible="0"/>
+        <Object id="automation 796" height="60" visible="0"/>
+        <Object id="route 819" color="30507:6798:5469"/>
+        <Object id="rtav 819" height="60" visible="1"/>
+        <Object id="automation 841" height="60" visible="0"/>
+        <Object id="automation 828" height="60" visible="0"/>
+        <Object id="route 851" color="20400:45150:38201"/>
+        <Object id="rtav 851" height="60" visible="1"/>
+        <Object id="automation 873" height="60" visible="0"/>
+        <Object id="automation 860" height="60" visible="0"/>
+        <Object id="route 883" color="1406:32657:33077"/>
+        <Object id="rtav 883" height="60" visible="1"/>
+        <Object id="automation 905" height="60" visible="0"/>
+        <Object id="automation 892" height="60" visible="0"/>
+        <Object id="route 915" color="833:18000:29718"/>
+        <Object id="rtav 915" height="60" visible="1"/>
+        <Object id="automation 937" height="60" visible="0"/>
+        <Object id="automation 924" height="60" visible="0"/>
+        <Object id="route 947" color="4072:12746:42501"/>
+        <Object id="rtav 947" height="60" visible="1"/>
+        <Object id="automation 969" height="60" visible="0"/>
+        <Object id="automation 956" height="60" visible="0"/>
+        <Object id="route 979" color="22618:30211:41958"/>
+        <Object id="rtav 979" height="60" visible="1"/>
+        <Object id="automation 1001" height="60" visible="0"/>
+        <Object id="automation 988" height="60" visible="0"/>
+        <Object id="route 1011" color="5804:37167:7244"/>
+        <Object id="rtav 1011" height="60" visible="1"/>
+        <Object id="automation 1033" height="60" visible="0"/>
+        <Object id="automation 1020" height="60" visible="0"/>
+        <Object id="route 1043" color="33750:44634:30311"/>
+        <Object id="rtav 1043" height="60" visible="1"/>
+        <Object id="automation 1065" height="60" visible="0"/>
+        <Object id="automation 1052" height="60" visible="0"/>
+        <Object id="route 1075" color="15317:22497:40778"/>
+        <Object id="rtav 1075" height="60" visible="1"/>
+        <Object id="automation 1097" height="60" visible="0"/>
+        <Object id="automation 1084" height="60" visible="0"/>
+        <Object id="strip 83" visible="1">
+          <Object id="processor 103"/>
+        </Object>
+        <Object id="strip 115" visible="1">
+          <Object id="processor 135"/>
+        </Object>
+        <Object id="strip 147" visible="1">
+          <Object id="processor 167"/>
+        </Object>
+        <Object id="strip 179" visible="1">
+          <Object id="processor 199"/>
+        </Object>
+        <Object id="strip 211" visible="1">
+          <Object id="processor 231"/>
+        </Object>
+        <Object id="strip 243" visible="1">
+          <Object id="processor 263"/>
+        </Object>
+        <Object id="strip 275" visible="1">
+          <Object id="processor 295"/>
+        </Object>
+        <Object id="strip 307" visible="1">
+          <Object id="processor 327"/>
+        </Object>
+        <Object id="strip 339" visible="1">
+          <Object id="processor 359"/>
+        </Object>
+        <Object id="strip 371" visible="1">
+          <Object id="processor 391"/>
+        </Object>
+        <Object id="strip 403" visible="1">
+          <Object id="processor 423"/>
+        </Object>
+        <Object id="strip 435" visible="1">
+          <Object id="processor 455"/>
+        </Object>
+        <Object id="strip 467" visible="1">
+          <Object id="processor 487"/>
+        </Object>
+        <Object id="strip 499" visible="1">
+          <Object id="processor 519"/>
+        </Object>
+        <Object id="strip 531" visible="1">
+          <Object id="processor 551"/>
+        </Object>
+        <Object id="strip 563" visible="1">
+          <Object id="processor 583"/>
+        </Object>
+        <Object id="strip 595" visible="1">
+          <Object id="processor 615"/>
+        </Object>
+        <Object id="strip 627" visible="1">
+          <Object id="processor 647"/>
+        </Object>
+        <Object id="strip 659" visible="1">
+          <Object id="processor 679"/>
+        </Object>
+        <Object id="strip 691" visible="1">
+          <Object id="processor 711"/>
+        </Object>
+        <Object id="strip 723" visible="1">
+          <Object id="processor 743"/>
+        </Object>
+        <Object id="strip 755" visible="1">
+          <Object id="processor 775"/>
+        </Object>
+        <Object id="strip 787" visible="1">
+          <Object id="processor 807"/>
+        </Object>
+        <Object id="strip 819" visible="1">
+          <Object id="processor 839"/>
+        </Object>
+        <Object id="strip 851" visible="1">
+          <Object id="processor 871"/>
+        </Object>
+        <Object id="strip 883" visible="1">
+          <Object id="processor 903"/>
+        </Object>
+        <Object id="strip 915" visible="1">
+          <Object id="processor 935"/>
+        </Object>
+        <Object id="strip 947" visible="1">
+          <Object id="processor 967"/>
+        </Object>
+        <Object id="strip 979" visible="1">
+          <Object id="processor 999"/>
+        </Object>
+        <Object id="strip 1011" visible="1">
+          <Object id="processor 1031"/>
+        </Object>
+        <Object id="strip 1043" visible="1">
+          <Object id="processor 1063"/>
+        </Object>
+        <Object id="strip 1075" visible="1">
+          <Object id="processor 1095"/>
+        </Object>
+      </GUIObjectState>
+    </UI>
+  </Extra>
 </Session>
diff --git a/libs/ardour/test/profiling/sessions/32tracks/instant.xml b/libs/ardour/test/profiling/sessions/32tracks/instant.xml
index 111f5f255a..61d2011c4f 100644
--- a/libs/ardour/test/profiling/sessions/32tracks/instant.xml
+++ b/libs/ardour/test/profiling/sessions/32tracks/instant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instant>
-  <Editor id="11" mixer-width="Wide" zoom-focus="3" zoom="30254.000336" snap-to="21" snap-mode="0" edit-point="EditAtPlayhead" playhead="0" left-frame="0" y-origin="0.000000" show-measures="yes" follow-playhead="no" stationary-playhead="no" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" internal-edit="no" join-object-range="no" show-editor-mixer="yes" show-editor-list="yes" editor-list-page="1" show-marker-lines="yes">
-    <geometry x-size="1272" y-size="996" x-pos="1280" y-pos="0" edit-horizontal-pane-pos="1121" notebook-shrunk="0" pre-maximal-horizontal-pane-position="826" edit-vertical-pane-pos="777"/>
+  <Editor id="11" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="30254.000336" snap-to="SnapToBeatDiv3" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeatDiv3" pre-internal-snap-mode="SnapOff" edit-point="EditAtPlayhead" playhead="0" left-frame="0" y-origin="0.000000" show-measures="yes" maximised="no" follow-playhead="no" stationary-playhead="no" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" internal-edit="no" join-object-range="no" show-editor-mixer="yes" show-editor-list="yes" editor-list-page="1" show-marker-lines="yes" nudge-clock-value="240000">
+    <geometry x-size="1366" y-size="714" x-pos="0" y-pos="27" edit-horizontal-pane-pos="1011" notebook-shrunk="0" edit-vertical-pane-pos="518"/>
     <Buttons>
       <Press/>
       <Release/>
diff --git a/libs/ardour/test/region_naming_test.cc b/libs/ardour/test/region_naming_test.cc
new file mode 100644
index 0000000000..bd32ae6416
--- /dev/null
+++ b/libs/ardour/test/region_naming_test.cc
@@ -0,0 +1,70 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "ardour/playlist.h"
+#include "ardour/region.h"
+#include "ardour/region_factory.h"
+#include "region_naming_test.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION (RegionNamingTest);
+
+using namespace std;
+using namespace ARDOUR;
+
+void
+RegionNamingTest::basicsTest ()
+{
+	for (int i = 0; i < 64; ++i) {
+		boost::shared_ptr<Region> r = RegionFactory::create (_r[0], true);
+		stringstream s;
+		s << "ar0." << (i + 1);
+		CPPUNIT_ASSERT_EQUAL (s.str(), r->name());
+	}
+
+	_r[0]->set_name ("foo");
+
+	for (int i = 0; i < 64; ++i) {
+		boost::shared_ptr<Region> r = RegionFactory::create (_r[0], true);
+		stringstream s;
+		s << "foo." << (i + 1);
+		CPPUNIT_ASSERT_EQUAL (s.str(), r->name());
+	}
+
+	for (int i = 0; i < 64; ++i) {
+		boost::shared_ptr<Region> rA = RegionFactory::create (_r[0], true);
+		boost::shared_ptr<Region> rB = RegionFactory::create (rA, true);
+		stringstream s;
+		s << "foo." << (i * 2 + 64 + 1);
+		CPPUNIT_ASSERT_EQUAL (s.str(), rA->name());
+		stringstream t;
+		t << "foo." << (i * 2 + 64 + 2);
+		CPPUNIT_ASSERT_EQUAL (s.str(), rA->name());
+	}
+}
+
+void
+RegionNamingTest::cacheTest ()
+{
+	/* Check that all the regions in the map are on the name list */
+
+	CPPUNIT_ASSERT_EQUAL (RegionFactory::region_map.size(), RegionFactory::region_name_map.size());
+
+	for (RegionFactory::RegionMap::iterator i = RegionFactory::region_map.begin(); i != RegionFactory::region_map.end(); ++i) {
+		CPPUNIT_ASSERT (RegionFactory::region_name_map.find (i->second->name()) != RegionFactory::region_name_map.end ());
+	}
+}
diff --git a/libs/ardour/test/region_naming_test.h b/libs/ardour/test/region_naming_test.h
new file mode 100644
index 0000000000..b5be107b3d
--- /dev/null
+++ b/libs/ardour/test/region_naming_test.h
@@ -0,0 +1,31 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "audio_region_test.h"
+
+class RegionNamingTest : public AudioRegionTest
+{
+	CPPUNIT_TEST_SUITE (RegionNamingTest);
+	CPPUNIT_TEST (basicsTest);
+	CPPUNIT_TEST (cacheTest);
+	CPPUNIT_TEST_SUITE_END ();
+
+public:
+	void basicsTest ();
+	void cacheTest ();
+};
diff --git a/libs/ardour/test/test_needing_session.cc b/libs/ardour/test/test_needing_session.cc
index 9d1995a8c8..a6220ded12 100644
--- a/libs/ardour/test/test_needing_session.cc
+++ b/libs/ardour/test/test_needing_session.cc
@@ -1,78 +1,21 @@
 #include "midi++/manager.h"
-#include "pbd/textreceiver.h"
 #include "pbd/compose.h"
 #include "pbd/enumwriter.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "test_needing_session.h"
+#include "test_util.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-class TestReceiver : public Receiver 
-{
-protected:
-	void receive (Transmitter::Channel chn, const char * str) {
-		const char *prefix = "";
-		
-		switch (chn) {
-		case Transmitter::Error:
-			prefix = ": [ERROR]: ";
-			break;
-		case Transmitter::Info:
-			/* ignore */
-			return;
-		case Transmitter::Warning:
-			prefix = ": [WARNING]: ";
-			break;
-		case Transmitter::Fatal:
-			prefix = ": [FATAL]: ";
-			break;
-		case Transmitter::Throw:
-			/* this isn't supposed to happen */
-			abort ();
-		}
-		
-		/* note: iostreams are already thread-safe: no external
-		   lock required.
-		*/
-		
-		cout << prefix << str << endl;
-		
-		if (chn == Transmitter::Fatal) {
-			exit (9);
-		}
-	}
-};
-
-TestReceiver test_receiver;
-
 void
 TestNeedingSession::setUp ()
 {
 	string const test_session_path = "libs/ardour/test/test_session";
 	system (string_compose ("rm -rf %1", test_session_path).c_str());
-	
-	SessionEvent::create_per_thread_pool ("test", 512);
-
-	test_receiver.listen_to (error);
-	test_receiver.listen_to (info);
-	test_receiver.listen_to (fatal);
-	test_receiver.listen_to (warning);
-
-	/* We can't use VSTs here as we have a stub instead of the
-	   required bits in gtk2_ardour.
-	*/
-	Config->set_use_lxvst (false);
-
-	AudioEngine* engine = new AudioEngine ("test", "");
-	init_post_engine ();
-
-	CPPUNIT_ASSERT (engine->start () == 0);
-
-	_session = new Session (*engine, test_session_path, "test_session");
-	engine->set_session (_session);
+	_session = load_session (test_session_path, "test_session");
 }
 
 void
diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc
new file mode 100644
index 0000000000..1514012d97
--- /dev/null
+++ b/libs/ardour/test/test_util.cc
@@ -0,0 +1,135 @@
+#include <fstream>
+#include <sstream>
+#include "pbd/xml++.h"
+#include "pbd/textreceiver.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
+
+static void
+check_nodes (XMLNode const * p, XMLNode const * q, list<string> const & ignore_properties)
+{
+	CPPUNIT_ASSERT_EQUAL (p->is_content(), q->is_content());
+	if (!p->is_content()) {
+		CPPUNIT_ASSERT_EQUAL (p->name(), q->name());
+	} else {
+		CPPUNIT_ASSERT_EQUAL (p->content(), q->content());
+	}
+
+	XMLPropertyList const & pp = p->properties ();
+	XMLPropertyList const & qp = q->properties ();
+	CPPUNIT_ASSERT_EQUAL (pp.size(), qp.size());
+
+	XMLPropertyList::const_iterator i = pp.begin ();
+	XMLPropertyList::const_iterator j = qp.begin ();
+	while (i != pp.end ()) {
+		CPPUNIT_ASSERT_EQUAL ((*i)->name(), (*j)->name());
+		if (find (ignore_properties.begin(), ignore_properties.end(), (*i)->name ()) == ignore_properties.end ()) {
+			CPPUNIT_ASSERT_EQUAL ((*i)->value(), (*j)->value());
+		}
+		++i;
+		++j;
+	}
+
+	XMLNodeList const & pc = p->children ();
+	XMLNodeList const & qc = q->children ();
+
+	CPPUNIT_ASSERT_EQUAL (pc.size(), qc.size());
+	XMLNodeList::const_iterator k = pc.begin ();
+	XMLNodeList::const_iterator l = qc.begin ();
+	
+	while (k != pc.end ()) {
+		check_nodes (*k, *l, ignore_properties);
+		++k;
+		++l;
+	}
+}
+
+void
+check_xml (XMLNode* node, string ref_file, list<string> const & ignore_properties)
+{
+	XMLTree ref (ref_file);
+
+	XMLNode* p = node;
+	XMLNode* q = ref.root ();
+
+	check_nodes (p, q, ignore_properties);
+}
+
+void
+write_ref (XMLNode* node, string ref_file)
+{
+	XMLTree ref;
+	ref.set_root (node);
+	ref.write (ref_file);
+}
+
+class TestReceiver : public Receiver 
+{
+protected:
+	void receive (Transmitter::Channel chn, const char * str) {
+		const char *prefix = "";
+		
+		switch (chn) {
+		case Transmitter::Error:
+			prefix = ": [ERROR]: ";
+			break;
+		case Transmitter::Info:
+			/* ignore */
+			return;
+		case Transmitter::Warning:
+			prefix = ": [WARNING]: ";
+			break;
+		case Transmitter::Fatal:
+			prefix = ": [FATAL]: ";
+			break;
+		case Transmitter::Throw:
+			/* this isn't supposed to happen */
+			abort ();
+		}
+		
+		/* note: iostreams are already thread-safe: no external
+		   lock required.
+		*/
+		
+		cout << prefix << str << endl;
+		
+		if (chn == Transmitter::Fatal) {
+			exit (9);
+		}
+	}
+};
+
+TestReceiver test_receiver;
+
+/** @param dir Session directory.
+ *  @param state Session state file, without .ardour suffix.
+ */
+Session *
+load_session (string dir, string state)
+{
+	SessionEvent::create_per_thread_pool ("test", 512);
+
+	test_receiver.listen_to (error);
+	test_receiver.listen_to (info);
+	test_receiver.listen_to (fatal);
+	test_receiver.listen_to (warning);
+
+	/* We can't use VSTs here as we have a stub instead of the
+	   required bits in gtk2_ardour.
+	*/
+	Config->set_use_lxvst (false);
+
+	AudioEngine* engine = new AudioEngine ("test", "");
+	init_post_engine ();
+
+	CPPUNIT_ASSERT (engine->start () == 0);
+
+	Session* session = new Session (*engine, dir, state);
+	engine->set_session (session);
+	return session;
+}
diff --git a/libs/ardour/test/test_util.h b/libs/ardour/test/test_util.h
new file mode 100644
index 0000000000..fea74a2ea8
--- /dev/null
+++ b/libs/ardour/test/test_util.h
@@ -0,0 +1,12 @@
+#include <string>
+#include <list>
+
+class XMLNode;
+
+namespace ARDOUR {
+	class Session;
+}
+
+extern void check_xml (XMLNode *, std::string, std::list<std::string> const &);
+extern void write_ref (XMLNode *, std::string);
+extern ARDOUR::Session* load_session (std::string, std::string);
diff --git a/libs/ardour/test/testrunner.cc b/libs/ardour/test/testrunner.cc
index 05b7a9fdba..fa4484fa25 100644
--- a/libs/ardour/test/testrunner.cc
+++ b/libs/ardour/test/testrunner.cc
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
 		}
 	}
 
-	ARDOUR::init (false, false);
+	ARDOUR::init (false, true);
 	
 	CppUnit::TestResult testresult;
 	
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 0ad59d1b31..1c45460088 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -406,7 +406,7 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 		*/
                 be_silent = (s == MonitoringSilence || s == MonitoringDisk);
 	}
-
+	
 	if (!_have_internal_generator && metering_state() == MeteringInput) {
 		_input->process_input (_meter, start_frame, end_frame, nframes);
 	}
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 656812352b..e894e4da15 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -429,10 +429,12 @@ def build(bld):
         testobj              = bld(features = 'cxx cxxprogram')
         testobj.source       = '''
                 test/dummy_lxvst.cc
+                test/test_util.cc
                 test/test_needing_session.cc
                 test/audio_region_test.cc
                 test/test_globals.cc
                 test/audio_region_read_test.cc
+                test/automation_list_property_test.cc
                 test/bbt_test.cc
                 test/tempo_test.cc
                 test/interpolation_test.cc
@@ -443,8 +445,10 @@ def build(bld):
                 test/framepos_minus_beats_test.cc
                 test/playlist_layering_test.cc
                 test/playlist_read_test.cc
+                test/playlist_equivalent_regions_test.cc
                 test/control_surfaces_test.cc
                 test/combine_regions_test.cc
+                test/region_naming_test.cc
                 test/mtdm_test.cc
                 test/testrunner.cc
         '''.split()
@@ -476,21 +480,23 @@ def build(bld):
             elif bld.env['build_target'] == 'x86_64':
                 testobj.source += [ 'sse_functions_64bit.s' ]
 
-        # Profiling
-        profilingobj = bld(features = 'cxx cxxprogram')
-        profilingobj.source = '''
-                test/dummy_lxvst.cc
-                test/profiling/runpc.cc
-        '''.split()
+        # Tester to just load a session
+        session_load_tester = bld(features = 'cxx cxxprogram')
+        session_load_tester.source = '''
+                    test/test_util.cc
+                    test/load_session.cc
+                    test/dummy_lxvst.cc
+            '''.split()
 
-        profilingobj.includes  = obj.includes
-        profilingobj.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+        session_load_tester.includes  = obj.includes
+        session_load_tester.includes.append ('test')
+        session_load_tester.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-        profilingobj.use       = ['libpbd','libmidipp','libardour']
-        profilingobj.name      = 'libardour-profiling'
-        profilingobj.target    = 'run-profiling'
-        profilingobj.install_path = ''
-        profilingobj.defines      = [
+        session_load_tester.use       = ['libpbd','libmidipp','libardour']
+        session_load_tester.name      = 'libardour-session-load-tester'
+        session_load_tester.target    = 'load-session'
+        session_load_tester.install_path = ''
+        session_load_tester.defines      = [
             'PACKAGE="libardour3profile"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
@@ -500,12 +506,47 @@ def build(bld):
                 os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
             ]
         if bld.env['FPU_OPTIMIZATION']:
-            profilingobj.source += [ 'sse_functions_xmm.cc' ]
+            session_load_tester.source += [ 'sse_functions_xmm.cc' ]
             if (bld.env['build_target'] == 'i386'
                 or bld.env['build_target'] == 'i686'):
-                profilingobj.source += [ 'sse_functions.s' ]
+                session_load_tester.source += [ 'sse_functions.s' ]
             elif bld.env['build_target'] == 'x86_64':
-                profilingobj.source += [ 'sse_functions_64bit.s' ]
+                session_load_tester.source += [ 'sse_functions_64bit.s' ]
+
+        # Profiling
+        for p in ['runpc', 'lots_of_regions', 'load_session']:
+            profilingobj = bld(features = 'cxx cxxprogram')
+            profilingobj.source = '''
+                    test/dummy_lxvst.cc
+                    test/test_util.cc
+            '''.split()
+
+            profilingobj.source.append('test/profiling/%s.cc' % p)
+
+            profilingobj.includes  = obj.includes
+            profilingobj.includes.append ('test')
+            profilingobj.uselib    = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
+                             'SAMPLERATE','XML','LRDF','COREAUDIO']
+            profilingobj.use       = ['libpbd','libmidipp','libardour']
+            profilingobj.name      = 'libardour-profiling'
+            profilingobj.target    = p
+            profilingobj.install_path = ''
+            profilingobj.defines      = [
+                'PACKAGE="libardour3profile"',
+                'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+                'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+                'LOCALEDIR="' + os.path.join(
+                    os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+                'VAMP_DIR="' + os.path.join(
+                    os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"'
+                ]
+            if bld.env['FPU_OPTIMIZATION']:
+                profilingobj.source += [ 'sse_functions_xmm.cc' ]
+                if (bld.env['build_target'] == 'i386'
+                    or bld.env['build_target'] == 'i686'):
+                    profilingobj.source += [ 'sse_functions.s' ]
+                elif bld.env['build_target'] == 'x86_64':
+                    profilingobj.source += [ 'sse_functions_64bit.s' ]
 
 def shutdown():
     autowaf.shutdown()
diff --git a/libs/audiographer/private/sndfile.hh b/libs/audiographer/private/sndfile.hh
index 91e99875ac..e1c167a8f2 100644
--- a/libs/audiographer/private/sndfile.hh
+++ b/libs/audiographer/private/sndfile.hh
@@ -52,6 +52,8 @@
 #ifndef SNDFILE_HH
 #define SNDFILE_HH
 
+#include <iostream>
+
 #include <sndfile.h>
 
 #include <string>
@@ -150,7 +152,7 @@ SndfileHandle::SNDFILE_ref::SNDFILE_ref (void)
 
 inline
 SndfileHandle::SNDFILE_ref::~SNDFILE_ref (void)
-{	if (sf != NULL) sf_close (sf) ; }
+{	if (sf != NULL) { 		std::cerr << "sf_closing " << sf << std::endl; sf_close (sf) ; } }
 
 inline
 SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, int srate)
@@ -169,6 +171,7 @@ SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, in
 		p->sfinfo.seekable = 0 ;
 
 		p->sf = sf_open (path, mode, &p->sfinfo) ;
+		std::cerr << "3 attempted to open " << path << " got " << p->sf << std::endl;
 		} ;
 
 	return ;
@@ -191,6 +194,7 @@ SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int c
 		p->sfinfo.seekable = 0 ;
 
 		p->sf = sf_open (path.c_str (), mode, &p->sfinfo) ;
+		std::cerr << "attempted to open " << path << " got " << p->sf << std::endl;
 		} ;
 
 	return ;
@@ -216,6 +220,7 @@ SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int ch
 		p->sfinfo.seekable = 0 ;
 
 		p->sf = sf_open_fd (fd, mode, &p->sfinfo, close_desc) ;
+		std::cerr << "2 attempted to open via fd " <<  fd << " got " << p->sf << std::endl;
 		} ;
 
 	return ;
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp
index 40e2e54625..b1ec7897cf 100644
--- a/libs/evoral/evoral/ControlList.hpp
+++ b/libs/evoral/evoral/ControlList.hpp
@@ -255,6 +255,8 @@ public:
         static void set_thinning_factor (double d);
         static double thinning_factor() { return _thinning_factor; }
 
+	bool operator!= (ControlList const &) const;
+
 protected:
 
 	/** Called by unlocked_eval() to handle cases of 3 or more control points. */
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index 9a820294ef..53200398a5 100644
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -1529,5 +1529,33 @@ ControlList::set_thinning_factor (double v)
 	_thinning_factor = v;
 }
 
+bool
+ControlList::operator!= (ControlList const & other) const
+{
+	if (_events.size() != other._events.size()) {
+		return true;
+	}
+
+	EventList::const_iterator i = _events.begin ();
+	EventList::const_iterator j = other._events.begin ();
+
+	while (i != _events.end() && (*i)->when == (*j)->when && (*i)->value == (*j)->value) {
+	        ++i;
+		++j;
+	}
+
+	if (i != _events.end ()) {
+		return true;
+	}
+	
+	return (
+		_parameter != other._parameter ||
+		_interpolation != other._interpolation ||
+		_min_yval != other._min_yval ||
+		_max_yval != other._max_yval ||
+		_default_value != other._default_value
+		);
+}
+
 } // namespace Evoral
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 3287cdb37e..909f791403 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -159,6 +159,8 @@ class Keyboard : public sigc::trackable, PBD::Stateful
 	    }
 	};
 
+	sigc::signal0<void> ShiftReleased;
+
   protected:
 	static Keyboard* _the_keyboard;
 
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 6328eb977c..81b9ae642a 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -243,6 +243,14 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 		keyval = event->keyval;
 	}
 
+	if (keyval == GDK_Shift_L) {
+		/* There is a special and rather hacky situation in Editor which makes
+		   it useful to know when a shift key has been released, so emit a signal
+		   here (see Editor::_stepping_axis_view)
+		*/
+		ShiftReleased (); /* EMIT SIGNAL */
+	}
+
 	if (event->type == GDK_KEY_PRESS) {
 
 		if (find (state.begin(), state.end(), keyval) == state.end()) {
diff --git a/libs/pbd/enumwriter.cc b/libs/pbd/enumwriter.cc
index 3ce296c664..6d911b2dea 100644
--- a/libs/pbd/enumwriter.cc
+++ b/libs/pbd/enumwriter.cc
@@ -127,7 +127,7 @@ EnumWriter::write (string type, int value)
 
 	if (x == registry.end()) {
 		error << string_compose (_("EnumWriter: unknown enumeration type \"%1\""), type) << endmsg;
-		throw unknown_enumeration();
+		throw unknown_enumeration (type);
 	}
 
 	if (x->second.bitwise) {
@@ -144,7 +144,7 @@ EnumWriter::read (string type, string value)
 
 	if (x == registry.end()) {
 		error << string_compose (_("EnumWriter: unknown enumeration type \"%1\""), type) << endmsg;
-		throw unknown_enumeration();
+		throw unknown_enumeration (type);
 	}
 
 	if (x->second.bitwise) {
@@ -267,7 +267,7 @@ EnumWriter::read_bits (EnumRegistration& er, string str)
 	} while (true);
 
 	if (!found) {
-		throw unknown_enumeration();
+		throw unknown_enumeration (str);
 	}
 
 	return result;
@@ -316,7 +316,7 @@ EnumWriter::read_distinct (EnumRegistration& er, string str)
 		}
 	}
 
-	throw unknown_enumeration();
+	throw unknown_enumeration(str);
 }
 
 void
diff --git a/libs/pbd/pbd/enumwriter.h b/libs/pbd/pbd/enumwriter.h
index 600f59bf29..95f1ea9e9f 100644
--- a/libs/pbd/pbd/enumwriter.h
+++ b/libs/pbd/pbd/enumwriter.h
@@ -25,13 +25,26 @@
 #include <string>
 #include <vector>
 #include <exception>
-
+#include <sstream>
 
 namespace PBD {
 
 class unknown_enumeration : public std::exception {
   public:
-	virtual const char *what() const throw() { return "unknown enumerator in PBD::EnumWriter"; }
+	unknown_enumeration (std::string const & e) throw() {
+		std::stringstream s;
+		s << "unknown enumerator " << e << " in PBD::EnumWriter";
+		_message = s.str ();
+	}
+
+	~unknown_enumeration () throw() {}
+	
+	virtual const char *what() const throw() {
+		return _message.c_str();
+	}
+
+private:
+	std::string _message;
 };
 
 class EnumWriter {
diff --git a/libs/pbd/pbd/properties.h b/libs/pbd/pbd/properties.h
index d961046760..e65929c60c 100644
--- a/libs/pbd/pbd/properties.h
+++ b/libs/pbd/pbd/properties.h
@@ -30,6 +30,7 @@
 #include "pbd/property_basics.h"
 #include "pbd/property_list.h"
 #include "pbd/enumwriter.h"
+#include "pbd/stateful.h"
 
 namespace PBD {
 
@@ -341,7 +342,121 @@ private:
 	/* no copy-construction */
 	EnumProperty (EnumProperty const &);
 };
+
+/** A Property which holds a shared_ptr to a Stateful object,
+ *  and handles undo using the somewhat inefficient approach
+ *  of saving the complete XML state of its object before and
+ *  after changes.  A sort of half-way house between the old
+ *  complete-state undo system and the new difference-based
+ *  one.
+ */
+template <class T>
+class SharedStatefulProperty : public PropertyBase
+{
+public:
+	typedef boost::shared_ptr<T> Ptr;
 	
+	SharedStatefulProperty (PropertyID d, Ptr p)
+		: PropertyBase (d)
+		, _current (p)
+	{
+		
+	}
+
+	SharedStatefulProperty (PropertyID d, Ptr o, Ptr c)
+		: PropertyBase (d)
+		, _old (o)
+		, _current (c)
+	{
+		
+	}
+
+	bool set_value (XMLNode const & node) {
+
+		/* Look for our node */
+		XMLNode* n = node.child (property_name ());
+		if (!n) {
+			return false;
+		}
+
+		/* And there should be one child which is the state of our T */
+		XMLNodeList const & children = n->children ();
+		if (children.size() != 1) {
+			return false;
+		}
+
+		_current->set_state (*children.front (), Stateful::current_state_version);
+		return true;
+	}
+
+	void get_value (XMLNode & node) const {
+		XMLNode* n = node.add_child (property_name ());
+		n->add_child_nocopy (_current->get_state ());
+	}
+
+	void clear_changes () {
+		/* We are starting to change things, so _old gets set up
+		   with the current state.
+		*/
+		_old.reset (new T (*_current.get()));
+	}
+
+	bool changed () const {
+		/* Expensive, but, hey; this requires operator!= in
+		   our T
+		*/
+		return (*_old != *_current);
+	}
+
+	void invert () {
+		_current.swap (_old);
+	}
+
+	void get_changes_as_xml (XMLNode* history_node) const {
+		/* We express the diff as before and after state, just
+		   as MementoCommand does.
+		*/
+		XMLNode* p = history_node->add_child (property_name ());
+		XMLNode* from = p->add_child ("from");
+		from->add_child_nocopy (_old->get_state ());
+		XMLNode* to = p->add_child ("to");
+		to->add_child_nocopy (_current->get_state ());
+	}
+
+	void get_changes_as_properties (PropertyList& changes, Command *) const {
+		if (changed ()) {
+			changes.add (clone ());
+		}
+	}
+
+	void apply_changes (PropertyBase const * p) {
+		*_current = *(dynamic_cast<SharedStatefulProperty const *> (p))->val ();
+	}
+
+	Ptr val () const {
+		return _current;
+	}
+
+	T* operator-> () const {
+		return _current.operator-> ();
+	}
+
+	operator bool () const {
+		return _current;
+	}
+
+protected:
+
+	Ptr _old;
+	Ptr _current;
+
+private:
+
+	/* No copy-construction nor assignment */
+	SharedStatefulProperty (SharedStatefulProperty<T> const &);
+	SharedStatefulProperty<T>& operator= (SharedStatefulProperty<T> const &);
+};
+
 } /* namespace PBD */
 
 #include "pbd/property_list_impl.h"
diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc
index e2ccd67738..3046f971ab 100644
--- a/libs/pbd/xml++.cc
+++ b/libs/pbd/xml++.cc
@@ -652,13 +652,19 @@ static XMLSharedNodeList* find_impl(xmlXPathContext* ctxt, const string& xpath)
 void
 XMLNode::dump (ostream& s, string p) const
 {
-	s << p << _name << " ";
-	for (XMLPropertyList::const_iterator i = _proplist.begin(); i != _proplist.end(); ++i) {
-		s << (*i)->name() << "=" << (*i)->value() << " ";
-	}
-	s << "\n";
-	
-	for (XMLNodeList::const_iterator i = _children.begin(); i != _children.end(); ++i) {
-		(*i)->dump (s, p + "  ");
+	if (_is_content) {
+		s << p << "  " << content() << "\n";
+	} else {
+		s << p << "<" << _name;
+		for (XMLPropertyList::const_iterator i = _proplist.begin(); i != _proplist.end(); ++i) {
+			s << " " << (*i)->name() << "=\"" << (*i)->value() << "\"";
+		}
+		s << ">\n";
+		
+		for (XMLNodeList::const_iterator i = _children.begin(); i != _children.end(); ++i) {
+			(*i)->dump (s, p + "  ");
+		}
+		
+		s << p << "</" << _name << ">\n";
 	}
 }
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index d28d4f5fb1..0a158f29ca 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -545,13 +545,9 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 			
 			if ((prop = (*niter)->property ("id")) != 0) {
 
-                                cerr << "Looking for MIDI Controllable with ID " << prop->value() << endl;
-				
 				ID id = prop->value ();
 				Controllable* c = Controllable::by_id (id);
 
-                                cerr << "\tresult = " << c << endl;
-				
 				if (c) {
 					MIDIControllable* mc = new MIDIControllable (this, *_input_port, *c, false);
                                         
diff --git a/libs/surfaces/mackie/pot.cc b/libs/surfaces/mackie/pot.cc
index 838753bf31..8f0298ea72 100644
--- a/libs/surfaces/mackie/pot.cc
+++ b/libs/surfaces/mackie/pot.cc
@@ -47,11 +47,20 @@ Pot::set (float val, bool onoff, Mode mode)
 	
 	// Pot/LED mode
 	msg |=  (mode << 4);
+
+	/*
+	 * Even though a width value may be negative, there is
+	 * technically still width there, it is just reversed,
+	 * so make sure to show it on the LED ring appropriately.
+	 */
+	if (val < 0){
+	  val = val * -1;
+	}
 	
 	// val, but only if off hasn't explicitly been set
 	if (onoff) {
 		if (mode == spread) {
-			msg |=  (lrintf (val * 6) + 1) & 0x0f; // 0b00001111
+			msg |=  (lrintf (val * 6)) & 0x0f; // 0b00001111
 		} else {
 			msg |=  (lrintf (val * 10.0) + 1) & 0x0f; // 0b00001111
 		}
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index f71e3520ed..2b4368f4bb 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -70,6 +70,7 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::
 	, _fader_touch (0)
 	, _vpot (0)
 	, _fader (0)
+	, _meter (0)
 	, _index (index)
 	, _surface (&s)
 	, _controls_locked (false)
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index bfb7479b0e..bd10378ac8 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -63,6 +63,7 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
 	, _active (false)
 	, _connected (false)
 	, _jog_wheel (0)
+	, _master_fader (0)
 	, _last_master_gain_written (-0.0f)
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "Surface::Surface init\n");