Formatting, typos, small terminology change