A little clean-up. Added members who emailed me.
Merge conflicts.