Split/add and fixes

done.