diff --git a/classes/heat.m b/classes/heat.m
index 3e1a2bb..15e7f67 100644
--- a/classes/heat.m
+++ b/classes/heat.m
@@ -44,7 +44,7 @@
             obj.heatDiffusion   = p.Results.heatDiffusion;
             obj.intpAtInterface = p.Results.intpAtInterface;
             % set default ode options after initialization of parent class
-            obj.odeOptions.RelTol = 1e-3;
+            obj.odeOptions.RelTol = 1e-4;
         end%function
         
         %% Display
@@ -635,7 +635,7 @@ function setBoundaryCondition(obj,varargin)
             index = finderb(z,dStart);
             unitCell = handles{index}; % this is the handle to the corresponding unitCell
             
-            k = cellfun(@feval,(unitCell.thermCond)',num2cell(T));            
+            k = cellfun(@feval,(unitCell.thermCond)',repmat({T},K,1));            
             % these are the parameters of the differential equation as they
             % are defined in matlab for the pdesolver
             
@@ -734,7 +734,7 @@ function setBoundaryCondition(obj,varargin)
             Cells           = obj.S.getNumberOfUnitCells;
 
             for k=1:obj.S.numSubSystems
-                parfor i=1:size(tempMap,1)
+                for i=1:size(tempMap,1)
                     for n=1:Cells
                         energyMap(i,n,k) = UCmasses(n)*( intHeatCapacity{n,k}(tempMap(i,n,k)) - intHeatCapacity{n,k}(initTemp(n,k)) );
                     end