fix html problems, make highlighting better