diff --git a/Source/Processors/Editors/RHD2000Editor.cpp b/Source/Processors/Editors/RHD2000Editor.cpp
index a1a7eae2b4f5611b2a9fbdf1fd3d84728ee96626..2ba24de678d0bfab70a8d8f75a13f5461aab145a 100644
--- a/Source/Processors/Editors/RHD2000Editor.cpp
+++ b/Source/Processors/Editors/RHD2000Editor.cpp
@@ -60,6 +60,7 @@ RHD2000Editor::RHD2000Editor(GenericProcessor* parentNode,
     rescanButton->setRadius(3.0f);
     rescanButton->setBounds(6, 108,65,18);
     rescanButton->addListener(this);
+    rescanButton->setTooltip("Check for connected headstages");
     addAndMakeVisible(rescanButton);
 
     for (int i = 0; i < 2; i++)
@@ -74,7 +75,15 @@ RHD2000Editor::RHD2000Editor(GenericProcessor* parentNode,
 
         addAndMakeVisible(button);
         button->addListener(this);
+        
+        if (i == 0)
+        {
+            button->setTooltip("Audio monitor left channel");
+        } else {
+            button->setTooltip("Audio monitor right channel");
+        }
     }
+    
 
     audioLabel = new Label("audio label", "Audio out");
     audioLabel->setBounds(180,25,180,15);
@@ -87,6 +96,7 @@ RHD2000Editor::RHD2000Editor(GenericProcessor* parentNode,
     adcButton->setBounds(180, 70,65,18);
     adcButton->addListener(this);
     adcButton->setClickingTogglesState(true);
+    adcButton->setTooltip("Enable/disable ADC channels");
     addAndMakeVisible(adcButton);
 
 
diff --git a/Source/Processors/RecordNode.cpp b/Source/Processors/RecordNode.cpp
index 0ddd3f1608e2abde48b1fc95ba7e0ea21773939f..c54a21d7549d7a5a94e09f3ac1e66986acc258d8 100755
--- a/Source/Processors/RecordNode.cpp
+++ b/Source/Processors/RecordNode.cpp
@@ -264,7 +264,7 @@ String RecordNode::generateDirectoryName()
     Time calendar = Time::getCurrentTime();
 
     Array<int> t;
-    t.add(calendar.getYear()-2000);
+    t.add(calendar.getYear());
     t.add(calendar.getMonth()+1); // January = 0
     t.add(calendar.getDayOfMonth());
     t.add(calendar.getHours());
diff --git a/Source/UI/ControlPanel.cpp b/Source/UI/ControlPanel.cpp
index 06a6fbe2364fc4274f3d0385067af1432b921c36..91f7871fde2facbb3948ee2ece33adab1448a078 100755
--- a/Source/UI/ControlPanel.cpp
+++ b/Source/UI/ControlPanel.cpp
@@ -97,6 +97,8 @@ CPUMeter::CPUMeter() : Label("CPU Meter","0.0"), cpu(0.0f), lastCpu(0.0f)
     // Typeface::Ptr typeface = new CustomTypeface(mis);
     // font = Font(typeface);
     // font.setHeight(12);
+    
+    setTooltip("CPU usage");
 }
 
 CPUMeter::~CPUMeter()
@@ -135,6 +137,8 @@ DiskSpaceMeter::DiskSpaceMeter()
     // Typeface::Ptr typeface = new CustomTypeface(mis);
     // font = Font(typeface);
     // font.setHeight(12);
+    
+    setTooltip("Disk space available");
 }
 
 
@@ -176,6 +180,7 @@ Clock::Clock() : isRunning(false), isRecording(false)
 
     totalTime = 0;
     totalRecordTime = 0;
+
 }
 
 Clock::~Clock()
@@ -293,6 +298,7 @@ ControlPanelButton::ControlPanelButton(ControlPanel* cp_) : cp(cp_)
 {
     open = false;
 
+    setTooltip("Show/hide recording options");
 }
 
 ControlPanelButton::~ControlPanelButton()
@@ -395,6 +401,7 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_)
     newDirectoryButton = new UtilityButton("+", Font("Small Text", 15, Font::plain));
     newDirectoryButton->setEnabledState(false);
     newDirectoryButton->addListener(this);
+    newDirectoryButton->setTooltip("Start a new data directory");
     addChildComponent(newDirectoryButton);
 
 
@@ -421,10 +428,11 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_)
     prependText->setEditable(true);
     prependText->addListener(this);
     prependText->setColour(Label::backgroundColourId, Colours::lightgrey);
+    prependText->setTooltip("Prepend to name of data directory");
 
     addChildComponent(prependText);
 
-    dateText = new Label("Date","YY-MM-DD_HH-MM-SS");
+    dateText = new Label("Date","YYYY-MM-DD_HH-MM-SS");
     dateText->setColour(Label::backgroundColourId, Colours::lightgrey);
     addChildComponent(dateText);
 
@@ -433,6 +441,7 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_)
     appendText->addListener(this);
     appendText->setColour(Label::backgroundColourId, Colours::lightgrey);
     addChildComponent(appendText);
+    appendText->setTooltip("Append to name of data directory");
 
     //diskMeter->updateDiskSpace(graph->getRecordNode()->getFreeSpace());
     //diskMeter->repaint();
diff --git a/Source/UI/ControlPanel.h b/Source/UI/ControlPanel.h
index 7c7505b775e6683c1239ecafdc640e2ff016571a..2b106f3f75c5e1cf17d2d080b31dad8d0cf820df 100755
--- a/Source/UI/ControlPanel.h
+++ b/Source/UI/ControlPanel.h
@@ -131,7 +131,7 @@ private:
 
 */
 
-class DiskSpaceMeter : public Component
+class DiskSpaceMeter : public Component, public SettableTooltipClient
 {
 public:
     DiskSpaceMeter();
@@ -223,7 +223,7 @@ private:
 
 */
 
-class ControlPanelButton : public Component
+class ControlPanelButton : public Component, public SettableTooltipClient
 {
 public:
     ControlPanelButton(ControlPanel* cp_);