Fixed highlighting, mostly probably