made a couple little changes, and i think i got the highlighting pretty well done considering... probably last commit before finals