diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index 19d878492..9ecfb6b2b 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -193,7 +193,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged)
       // This will happen consistently when going from more bytes per sample to fewer...
       // This will create a block that's smaller than mMinSamples, which 
       // shouldn't be allowed, but we agreed it's okay for now.
-      //vvvvv ANSWER-ME: Does this cause any bugs, or failures on write, elsewhere?
+      //vvv ANSWER-ME: Does this cause any bugs, or failures on write, elsewhere?
       //    If so, need to special-case (len < mMinSamples) and start combining data 
       //    from the old blocks... Oh no!
       
@@ -223,7 +223,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged)
       {
          SeqBlock* pOldSeqBlock = mBlock->Item(i);
          mDirManager->Deref(pOldSeqBlock->f);
-         pOldSeqBlock->f = NULL; //vvvvv ...so we don't delete the file when we delete mBlock, next. ANSWER-ME: Right, or delete?
+         pOldSeqBlock->f = NULL; //vvv ...so we don't delete the file when we delete mBlock, next. ANSWER-ME: Right, or delete?
       }
       delete mBlock;
 
diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp
index 523a9153b..4657ff49a 100644
--- a/src/toolbars/DeviceToolBar.cpp
+++ b/src/toolbars/DeviceToolBar.cpp
@@ -348,10 +348,10 @@ void DeviceToolBar::EnableDisableButtons()
 void DeviceToolBar::RegenerateTooltips()
 {
 #if wxUSE_TOOLTIPS
-   mOutput->SetToolTip(_("Output Device"));
-   mInput->SetToolTip(_("Input Device"));
-   mHost->SetToolTip(_("Audio Host"));
-   mInputChannels->SetToolTip(_("Input Channels"));
+   mOutput->SetToolTip(mOutput->GetName() + wxT(" - ") + mOutput->GetStringSelection());
+   mInput->SetToolTip(mInput->GetName() + wxT(" - ") + mInput->GetStringSelection());
+   mHost->SetToolTip(mHost->GetName() + wxT(" - ") + mHost->GetStringSelection());
+   mInputChannels->SetToolTip(mInputChannels->GetName() + wxT(" - ") + mInputChannels->GetStringSelection());
 #endif
 }
 
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index d3942140c..88600c84c 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -407,7 +407,7 @@ ToolManager::ToolManager( AudacityProject *parent )
 
    // Create all of the toolbars
    mBars[ ToolsBarID ]         = new ToolsToolBar();
-   mBars[ TransportBarID ]       = new ControlToolBar();
+   mBars[ TransportBarID ]     = new ControlToolBar();
    mBars[ MeterBarID ]         = new MeterToolBar();
    mBars[ EditBarID ]          = new EditToolBar();
    mBars[ MixerBarID ]         = new MixerToolBar();