fixed order of colour points
whitespace clean up
upped version