Split/add and fixes

I think the docstring in the topmost class gives all the details.