fix some typos an bugs