bugfixes, working on splitter