Fix some typos and do some reformulations