splitter: some refactoring, minor fixes, disable started