some fixes, new color