typos and terminology fixes