fixes and typos