Split/add and fixes

sure. done.