fixes and correct typos