colour: fix a colour reset, and make more output colourised