Added colour, sorted some minor issues