* Refactoring of label splitting; new unit test still failing. * Label acc size calculations to separate methods. * Final fixes and cleanup