carry on splitting
bunch of small fixes