Color change and fixed a warning.

going to move into master