work on generalized composition, and misc edits