color fixes etc