clean up the html and some typos