add a revised outline structure on the document, and a couple FIXME's