Updates

Undid some things, added some things, re-did some things, and pulled out
a bunch of hair