orderless relocation and bugfixes