child gender added & small fixes (see TODO)