Added colours and a few fixes