A ton of cleanup updates.

Next order of business is to write all of the configuration functions.