Fix phrasing, terminology and typos