Big batch of updates.

Hold on to your butts...