fixed a few more things, _extend composition is interesting