fixed more highlighting