Calibration simulation, part 2
Updated RNG handling to match current code
RNG updates