Small improvements and added family.affected