fixed found bugs and typos