color and small fix