Some bug fixes, fix up documentation in places, start looking at making split-sto better algorithmically