Added the comment definition. Updated the names used to highlight tags.