tweaks to color and shit.  yay
resolved merge issues