Whole lot of changes based off of "Remaining Tweaks"