fixed colors a bit.
cleaned up