Bunch of updates.

Hopefully I did this right.