Highlights and comments improvements