Colours and some small fixes