Split/add and fixes

Yup.  fixed.