Wanted to respond to the question about aircraft attacking units. I didn't notice it happening in particular, but I also didn't move much near them so it could be possible they weren't in range. They definitely had two bombers in an aerodrone in their nearest city and razed some of my bordering tiles. Also I was using TCS' improved aerodrone mod which makes them more beneficial and not take a district slot, so that could be why the AI was more inclined to build them. And to anyone who wishes to complain about the AI taking City States think of it this way: you can conquer them except for the CS they took and then take that one last and liberate it to remove some of your warmongering penalties!