bugfixes to parallel composition
tiny refactoring