Split/add and fixes

This will miss tuples, I think.