Split/add and fixes

Yup - I must have changed this in a subsequent commit.