tune under/over-ride color and minor code style changes