Duh
Lots of little changes.