Split/add and fixes

Nit: these should be on separate lines.