Fix bugs and typos