bugfixes, parent re-assignments