Restored last versions of splits and fixes. Phew!