Minor fixes and color choices