some font-lock changes