More tweaks and bug fixes. Now can split upper componenet on first node.