Add real color to warning color and minor fixes and changes