Fix color and more tweaks