more content and a rough editing pass -- TODOs marked where I have more to write up