fixed a color mismatch and a couple of logic issues