Big pull of many changes.

Lots o' changes.