The rest of the changes and tests I ran last night at like midnight