Some changes to intersex based on email.

These are a work in progress, and will probably be updated.