tweaks + updated coloring