cleanup and some typos