Adjusting colors for issue #15.
Fixing issue #73.
Fixing second part of issue #73
Fixing issue #64
Fixing issue #52.