Made a lot of the aforementioned changes tonight. We'll see how this flies for a bit and see if it needs further tweaking.