Clean up a bit
Handle splits and merges
Fix root splits
Add accounting, fix corner case, fix comments