fixed a couple more regex matches and some color work