diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h
index 04ee6ed53a2df60df63149ffc5bc5c6d078a6ee0..52d95d9a846d1938df2bc2f2e1400cba3983b53a 100644
--- a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h
+++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h
@@ -142,7 +142,7 @@ namespace Rich
          *  in order to account for the non-flat secondary mirrors.
          */
         Gaudi::Property< RadiatorArray<int> > m_nMaxQits
-        { this, "NQuarticIterationsForSecMirrors", { 3, 3, 3 } };
+        { this, "NQuarticIterationsForSecMirrors", { 1, 1, 3 } };
 
         /** Minimum number of iterations of the quartic solution, for each radiator, 
          *  in order to account for the non-flat secondary mirrors.
diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichSIMDQuarticPhotonReco.h b/Rich/RichFutureRecPhotonAlgorithms/src/RichSIMDQuarticPhotonReco.h
index 4d20e153e28b1c2aecdacaaa26121cc9f2aefe01..d4ee00ff292ec1523d4be621d93f469814e9e1ce 100644
--- a/Rich/RichFutureRecPhotonAlgorithms/src/RichSIMDQuarticPhotonReco.h
+++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichSIMDQuarticPhotonReco.h
@@ -117,11 +117,15 @@ namespace Rich
             }
           };
           
-          /// Vector
+          /** @class Vector
+           *  Basic representation of a (X,Y,Z) displacement vector
+           */
           template< typename TYPE >
           class Vector : public XYZ<TYPE> { };
 
-          /// Point 
+          /** @class Point
+           *  Basic representation of a (X,Y,Z) position vector
+           */
           template< typename TYPE >
           class Point  : public XYZ<TYPE> { };
 
@@ -131,7 +135,7 @@ namespace Rich
                                               const POINTB& pb ) noexcept
           {
             return { pa.X() - pb.X(), pa.Y() - pb.Y(), pa.Z() - pb.Z() };
-          }  
+          }
 
           /** @class Plane 
            *  Basic representation of a SIMD vectorised plane.
@@ -147,7 +151,7 @@ namespace Rich
           public:
             /// Plane Normal (X,Y,Z) == plane parameters (A,B,C)
             Vector<TYPE> normal;
-            /// D
+            /// Parameter D
             TYPE D{};
           public:
             /// Normal Vector
diff --git a/Rich/RichFutureRecSys/examples/RichFuture.py b/Rich/RichFutureRecSys/examples/RichFuture.py
index 1427d4b3c380453dc0b85de92018b86534866740..68ef2a4ea3e880d9b804fd270a5c30cb902e1b39 100644
--- a/Rich/RichFutureRecSys/examples/RichFuture.py
+++ b/Rich/RichFutureRecSys/examples/RichFuture.py
@@ -5,11 +5,6 @@
 
 # --------------------------------------------------------------------------------------
 
-# Example command line
-# gaudirun.py -T <opts> 2>&1 | tee ${User_release_area##/*/}-${CMTCONFIG}.log
-
-# --------------------------------------------------------------------------------------
-
 from Gaudi.Configuration import *
 from GaudiConfig.ControlFlow import seq
 from Configurables import CondDB, LHCbApp, GaudiSequencer
@@ -32,7 +27,7 @@ rootFileBaseName = myBuild + "-" + myConf + "-" + histos
 HistogramPersistencySvc().OutputFile = rootFileBaseName + "-Histos.root"
 
 # Event numbers
-nEvents                   = 1000
+nEvents                   = 5000
 EventSelector().PrintFreq = 100
 #LHCbApp().SkipEvents = 5416
 
@@ -166,23 +161,21 @@ RichMoni = RichRecMonitors( inputTrackLocations = tkLocs,
                             outputPIDLocations  = pidLocs,
                             histograms          = histos )
 # Uncomment to enable monitoring
-#all.Members += [ RichMoni ]
+all.Members += [ RichMoni ]
 # --------------------------------------------------------------------------------------
 
 # --------------------------------------------------------------------------------------
-# Explicitly unpack the MCParticles and MCVertices
+# MC Checking
 from Configurables import UnpackMCParticle, UnpackMCVertex
-# Unpack the MC digit summaries
 from Configurables import DataPacking__Unpack_LHCb__MCRichDigitSummaryPacker_ as RichSumUnPack
-# MC Checking
 from RichFutureRecMonitors.ConfiguredRecoMonitors import RichRecCheckers
 RichCheck = RichRecCheckers( inputTrackLocations = tkLocs,
                              onlineBrunelMode    = online,
                              outputPIDLocations  = pidLocs,
                              histograms          = histos )
 # Uncomment to enable checking
-#fetcher.DataKeys += ['pMC/Vertices','pMC/Particles']
-#all.Members += [ UnpackMCVertex(), UnpackMCParticle(), RichSumUnPack("RichSumUnPack"), RichCheck ]
+fetcher.DataKeys += ['pMC/Vertices','pMC/Particles']
+all.Members += [ UnpackMCVertex(), UnpackMCParticle(), RichSumUnPack("RichSumUnPack"), RichCheck ]
 # --------------------------------------------------------------------------------------
 
 # --------------------------------------------------------------------------------------
@@ -210,13 +203,21 @@ GlobalRecoChecks().AddANNPIDInfo = False
 # --------------------------------------------------------------------------------------
 # Callgrind profiling
 from Configurables import CallgrindProfile
-p = CallgrindProfile('CallgrindProfile')
-p.StartFromEventN = 40
-p.StopAtEventN    = nEvents
-p.DumpAtEventN    = nEvents
-p.DumpName = 'CALLGRIND-OUT'
+p = CallgrindProfile( StartFromEventN = 25,
+                      StopAtEventN    = nEvents,
+                      DumpAtEventN    = nEvents,
+                      DumpName        = 'CALLGRIND-OUT' )
 #RichRec.Members.insert(0,p) # Uncomment to enable
 # --------------------------------------------------------------------------------------
-# Example command line
+
+# --------------------------------------------------------------------------------------
+# Example command lines
+# --------------------------------------------------------------------------------------
+
+# Normal running
+# gaudirun.py -T ~/LHCbCMake/Feature/Rec/Rich/RichFutureRecSys/examples/{RichFuture.py,data/MCXDstUpgradeFiles.py} 2>&1 | tee ${User_release_area##/*/}-${CMTCONFIG}.log
+
+# with valgrind profiling
 # gaudirun.py -T --profilerName=valgrindcallgrind --profilerExtraOptions="__instr-atstart=no -v __smc-check=all-non-file __dump-instr=yes __trace-jump=yes __cache-sim=yes __branch-sim=yes"  ~/LHCbCMake/Feature/Rec/Rich/RichFutureRecSys/examples/{RichFuture.py,data/MCXDstUpgradeFiles.py} 2>&1 | tee profile.log
+
 # --------------------------------------------------------------------------------------
diff --git a/Rich/RichFutureRecSys/python/RichFutureRecSys/ConfiguredRichReco.py b/Rich/RichFutureRecSys/python/RichFutureRecSys/ConfiguredRichReco.py
index 867280d0d021677f2d5d3bf77daadfcb3722ba06..0ed6f7652dc434e9b53f54f3165cd56a41d61b94 100644
--- a/Rich/RichFutureRecSys/python/RichFutureRecSys/ConfiguredRichReco.py
+++ b/Rich/RichFutureRecSys/python/RichFutureRecSys/ConfiguredRichReco.py
@@ -530,7 +530,7 @@ def RichRecoSequence( GroupName = "", # Optional name given to this group.
             photReco.NSigma                   = ( 9.0,   3.50,   4.40  )
         if photonReco == "Quartic" :
             # Number of iterations for non-flat secondary mirrors
-            photReco.NQuarticIterationsForSecMirrors = ( 3,     3,     3     )
+            photReco.NQuarticIterationsForSecMirrors = ( 1,     1,     3 )
         if photonReco == "FastQuartic" :
             # Turn off various aspects for speed         Aero   R1Gas  R2Gas
             photReco.FindUnambiguousPhotons          = ( False, False, False )