refactoring and bugfixes in Joiner