Split/add and fixes

Yes. thanks.