Fix one bug in Simplify and two small typos