integrate Marc's version of intro and abstract, change the outline
merge