Add XRay timings + patch fluff from CB updates.