Emphasis additions and fixes