Fix colours and incorrectly commented values