Highlight terms in their definitions. Few other minor improvements.