Color and other tweaks