More combined splits stuff, fix tracking for run games