Split/add and fixes

Nit: two lines.