Colour and ray.h corrected