Add parenting, bugfixes