Lots of improvements to splitting.