remove some cruft. fix some typos