More work on composition.tex

and other misc. additions and fixes.