Lots of work on composition.tex