adds better colors
some clean up