Topic fixes and a few typos