Fix some small bugs and typos