Edited stuff.

Lots of stuff.