diff --git a/PeakOTron.py b/PeakOTron.py
index b1d72499d12d503922868d777b2578bcbbeba68f..b58fce335ed1e554fce262007ca2b8999307f20a 100644
--- a/PeakOTron.py
+++ b/PeakOTron.py
@@ -60,7 +60,7 @@ class BandWidthOptimiser:
         try:
             x_kde, y_kde = FFTKDE(kernel = self.kernel, bw=bw).fit(self.data).evaluate(self.n_kde_samples)
         
-            loss = -np.nansum(np.log(y_kde))
+            loss = -np.sum(np.log(y_kde))
             
         except:
             
@@ -133,7 +133,6 @@ class BinnedLH:
         return nlogL
     
     
-
     
     
 class Chi2Regression:
@@ -257,7 +256,7 @@ class PeakOTron:
                       "omega"]
         
         self._eps = np.finfo(np.float64).eps * 10
-        self._eps_kde = 1e-6
+        self._eps_kde = 1e-5
         self._FWHM2Sigma = 1/(2*np.sqrt(2*np.log(2)))
         
         self._plot_figsize= (10,10)
@@ -1209,16 +1208,18 @@ class PeakOTron:
         fig.tight_layout()
 
         fig.subplots_adjust(hspace=.0)
-        plt.pause(0.01)
         if(save_directory is not None):
             print("Saving figure to {0}...".format(save_directory))
             fig.savefig(save_directory)
         if(display):
+            plt.pause(0.01)
             fig.show()
+        else:
+            plt.close(fig)
         
     
   
-    def PlotSummary(self, save_directory=None):
+    def PlotSummary(self, display=True, save_directory=None):
     
             fig = plt.figure(figsize=(20,40))
             gs = gridspec.GridSpec(4, 2)
@@ -1249,7 +1250,10 @@ class PeakOTron:
                 print("Saving figure to {0}...".format(save_directory))
                 fig.savefig(save_directory)
             if(display):
+                plt.pause(0.01)
                 fig.show()
+            else:
+                plt.close(fig)
  
             
     def GetModel(self, x):