Misc changes of varying degrees
Redo some stuff that I overwrote.  WOOPS