Added highlighting for comments and control words