fix red and yellow (most of it anyway)