Fix typos and more update