More coloring and tweaks