minor tweaks, prep for color changing