added color options. minor tweaks