formatting fixes and typos