Add some back.
Add a few new global defaults and rename some stuff.