pointless change
re-ordered colors, fixed comments