Split/add and fixes