tiny changes
more changes to outline and adding text/TODOs where needed as a result of reorg