changed the colours and a few housekeeping items