split-sto, some fixes