parenting/reordering bugfixes