bugfixes
party mergers and order (thanks Vlad)