fix some typos and more