Split/add and fixes

Ah, I see.