Most of what I thought should be added, already was. Woo.

Many of the changes I originally intended to bring in with this ticket were already done by others, but there were a few configuration options I still wanted to add. It ended up being pretty small though; the other changes I made before were duplicated by others.