Fix ancestry bugs

closes #44; closes #34