diff --git a/Calibrator.mm b/Calibrator.mm
index 4b82bd7..3d4e16f 100644
--- a/Calibrator.mm
+++ b/Calibrator.mm
@@ -87,15 +87,15 @@
 const OpenGazer::Point Calibrator::defaultpointarr[] = {OpenGazer::Point(0.5, 0.5), 
     OpenGazer::Point(0.1, 0.5), OpenGazer::Point(0.9, 0.5),
     OpenGazer::Point(0.5, 0.1), OpenGazer::Point(0.5, 0.9), 
-//    OpenGazer::Point(0.1, 0.1), OpenGazer::Point(0.1, 0.9), 
-//    OpenGazer::Point(0.9, 0.9), OpenGazer::Point(0.9, 0.1), 
-//    OpenGazer::Point(0.33, 0.33), OpenGazer::Point(0.33, 0.66), 
-//    OpenGazer::Point(0.66, 0.66), OpenGazer::Point(0.66, 0.33),
-//    OpenGazer::Point(0.05, 0.5), OpenGazer::Point(0.95, 0.5),
-//    OpenGazer::Point(0.5, 0.05), OpenGazer::Point(0.5, 0.95), 
-//    OpenGazer::Point(0.05, 0.05), OpenGazer::Point(0.05, 0.95), 
-//    OpenGazer::Point(0.95, 0.95), OpenGazer::Point(0.95, 0.05), 
-//    OpenGazer::Point(0.25, 0.25), OpenGazer::Point(0.25, 0.75), 
+    OpenGazer::Point(0.1, 0.1), OpenGazer::Point(0.1, 0.9), 
+    OpenGazer::Point(0.9, 0.9), OpenGazer::Point(0.9, 0.1), 
+    OpenGazer::Point(0.33, 0.33), OpenGazer::Point(0.33, 0.66), 
+    OpenGazer::Point(0.66, 0.66), OpenGazer::Point(0.66, 0.33),
+    OpenGazer::Point(0.05, 0.5), OpenGazer::Point(0.95, 0.5),
+    OpenGazer::Point(0.5, 0.05), OpenGazer::Point(0.5, 0.95), 
+    OpenGazer::Point(0.05, 0.05), OpenGazer::Point(0.05, 0.95), 
+    OpenGazer::Point(0.95, 0.95), OpenGazer::Point(0.95, 0.05), 
+    OpenGazer::Point(0.25, 0.25), OpenGazer::Point(0.25, 0.75), 
     OpenGazer::Point(0.75, 0.75), OpenGazer::Point(0.75, 0.25)};
 
 vector<OpenGazer::Point>
diff --git a/og3/AppDelegate.mm b/og3/AppDelegate.mm
index dd9ecd5..642ceb0 100644
--- a/og3/AppDelegate.mm
+++ b/og3/AppDelegate.mm
@@ -150,7 +150,7 @@ -(void)launchGazeTracking{
 
         
 #ifdef CONFIGURATION_Debug_OpenCV
-        NSLog(@"\n\n\n\n   FYI - OpenCV debug is enabled\n\n");
+        NSLog(@"\n\n  FYI - OpenCV debug is enabled\n\n");
         cvNamedWindow(MAIN_WINDOW_NAME, CV_GUI_EXPANDED);
         cvResizeWindow(MAIN_WINDOW_NAME, 640, 480);
         //    createButtons();
@@ -230,25 +230,32 @@ -(void)moveCalibrationPoint:(NSNotification*)note{
 
 // The calibration process has started
 -(void)calibrationStarted:(NSNotification*)note{
-    NSLog(@"Calibration Started");
+    NSLog(@"Notification :: Calibration Started");
     [gazeWindowController window];
 }
 
 // There was a request to show the calibration GUI and such
 -(void)calibrationStartRequested:(NSNotification*)note{
-    NSLog(@"Calibration Requested");
+    NSLog(@"Notification :: Calibration Requested");
     [self launchCalibrationGUI];
 }
 
 // The calibration process ended, wbut we'll still show a GUI with the results
 -(void)finishedCalibration:(NSNotification*)note{
-    NSLog(@"\n\n\n\n\n      finishedCalibration");
+    NSLog(@"Notification :: Calibration Finished");
     self.gazeTrackerStatus = kGazeTrackerCalibrated;
     [calibrationWindowController finishCalibration:self.gazeTrackerStatus];
 }
 
 // Called when the user closes the calibration interface
 -(void) calibrationClosed:(NSNotification*)note{
+    NSLog(@"Notification :: Calibration UI Closed");
+    
+    // Close the Gaze Target window
+    [[gazeWindowController window] close];
+    
+    // Resign focus
+    //[[NSApplication sharedApplication] hide:self];
     
     // Send out a note that we've finished calibrating with the current status of the gaze tracker
     [[NSDistributedNotificationCenter defaultCenter] postNotificationName:kGrazeTrackerCalibrationEnded
@@ -258,7 +265,7 @@ -(void) calibrationClosed:(NSNotification*)note{
 }
 
 -(void)terminationRequested:(NSNotification*)note{
-    NSLog(@"Termination requested");
+    NSLog(@"Notification :: Termination requested");
     [[NSApplication sharedApplication] terminate:self];
 }