diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/EyeLinkCoreGraphicsPsychoPy.py b/EyeLinkCoreGraphicsPsychoPy.py
old mode 100755
new mode 100644
diff --git a/Images/face2nS_11-160.tif b/Images/face2nS_11-160.tif
old mode 100755
new mode 100644
diff --git a/Images/house4n_11-160.tif b/Images/house4n_11-160.tif
old mode 100755
new mode 100644
diff --git a/SaccadePursuit.py b/SaccadePursuit.py
old mode 100755
new mode 100644
diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py
old mode 100755
new mode 100644
index 47d5417..12c7746
--- a/SaccadePursuitEyeTracking.py
+++ b/SaccadePursuitEyeTracking.py
@@ -31,7 +31,7 @@ distance_to_monitor = 74
 monitor_px = [1440,900]
 window_screen = 1
 
-disableTracker = False # For Debugging
+disableTracker = True # For Debugging
 isi_time = 2 # Interstimulus Interval
 data_directory = os.path.join(
     os.path.expanduser('~'), 'Desktop', 'ExperimentalData', 'SaccadePursuitEyeTracking')
@@ -59,7 +59,7 @@ pursuit_time = [40,20,15]
 
 # Necker Cube Parameters
 number_of_necker_trials = 1
-number_of_necker_blocks = 4
+number_of_necker_blocks = 3
 necker_time = 60
 necker_color = [190,190,190]
 necker_bg_color = [30,30,30]
@@ -302,9 +302,11 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
             )
             self.tracker.initialize_graphics()
             self.tracker.open_edf()
-            self.tracker.send_command("add_file_preamble_text 'Saccade Pursuit Experiment Plus Fixation and Necker Cube'")
+            #self.tracker.send_command("add_file_preamble_text 'Saccade Pursuit Experiment Plus Fixation and Necker Cube'")
             self.tracker.initialize_tracker()
-            self.tracker.send_calibration_settings()
+            self.tracker.send_calibration_settings(
+                settings={'preamble_text':'Saccade Pursuit Experiment Plus Fixation and Necker Cube',}
+                )
 
         for instruction in self.instruct_text:
             self.display_text_screen(text=instruction)
@@ -312,6 +314,7 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
         if not self.disableTracker:
             self.tracker.display_eyetracking_instructions()
             self.tracker.setup_tracker()
+            self.tracker.send_command("track_search_limits=NO")
         
         #random.shuffle(conditions)
 
@@ -355,8 +358,6 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
 
             for block_num in range(numBlocks):
                 block = self.make_block(condition, numTrials)
-                if not self.disableTracker:
-                    self.tracker.drift_correct()
                 self.display_text_screen(text='Get ready...', wait_for_input=False)
                 psychopy.core.wait(2)
                 if condition == 'Saccade' or condition == 'AntiSaccade':
diff --git a/__pycache__/SaccadePursuit.cpython-36.pyc b/__pycache__/SaccadePursuit.cpython-36.pyc
deleted file mode 100644
index a5b3657..0000000
Binary files a/__pycache__/SaccadePursuit.cpython-36.pyc and /dev/null differ
diff --git a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc
deleted file mode 100644
index 24ce416..0000000
Binary files a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc and /dev/null differ
diff --git a/eyelinker.py b/eyelinker.py
old mode 100755
new mode 100644
index fe04003..02d4ba7
--- a/eyelinker.py
+++ b/eyelinker.py
@@ -212,9 +212,9 @@ class EyeLinker(object):
         try:
             self.tracker.doDriftCorrect(position[0], position[1], 1, setup)
             self.tracker.applyDriftCorrect()
-        except:# RuntimeError as e:
-            #print(e.message)
-            self.tracker.doTrackerSetup()
+        except RuntimeError as e:
+            print(e.message)
+            #self.tracker.doTrackerSetup()
 
     def record(self, trial_func):
         def wrapped_func():
diff --git a/template.py b/template.py
old mode 100755
new mode 100644
index f492ecd..f44439a
--- a/template.py
+++ b/template.py
@@ -167,8 +167,8 @@ class BaseExperiment(object):
         """
 
         if filename is None:
-            filename = (self.experiment_name + 
-                        self.experiment_info['Subject Identifier'].zfill(3) +
+            filename = (self.experiment_name + '_' + 
+                        self.experiment_info['Subject Identifier'] +
                         '_info')
         elif filename[-4:] == '.txt':
             filename = filename[:-4]
@@ -201,8 +201,8 @@ class BaseExperiment(object):
         """
 
         if data_filename is None:
-            data_filename = (self.experiment_name + 
-            self.experiment_info['Subject Identifier'].zfill(3))
+            data_filename = (self.experiment_name + '_' + 
+            self.experiment_info['Subject Identifier'])
         elif data_filename[-4:] == '.csv':
             data_filename = data_filename[:-4]
 
@@ -379,6 +379,8 @@ class BaseExperiment(object):
         if wait_for_input:
             psychopy.core.wait(.2)  # Prevents accidental key presses
             keys = psychopy.event.waitKeys()
+            while keys != ['space']:
+                keys = psychopy.event.waitKeys()
             self.experiment_window.flip()
 
         return keys