added colors and some more tweaks