Note on the CC, it has been 0.5 three times, 1.5 twice, 1 four times (I wasn't always testing for it) during the SLAM but the 0.5s were when I was fighting to get the FC up to SLAM levels.
I'll continue the SLAM through today and take a final OCLT tomorrow and they do as you suggest.
Thanks...