Make gender example more complete
Fixed some merge conflicts