polish ancestor stuff a bit