fixed comments to not be greedy matches
slight restructure
start of colours