fixes concerning how to split branches
fixes for the fixes