fixes & new color