toc seems to work. So to-do items 1 and 2 are taken care of.