Fix some highlights and stuff.