added coloring and sorting to make it easier to find mistakes
simplified output; not sure if good
Merge remote-tracking branch 'upstream/master'