code hightlight fixes