Improve ToC + typos