fix hilighting + some style tweaks