Added XRay. General fixes.