7. Torenity made a workaround which satisfies the need I had :) So the category stays.
8. It'll be in both as per SerBear's suggestions.
15. It'll be in both.
19. OK :)
23. I agree with SerBear on this in the end. It's just implied that all drake cities (and even human ones in the north actually) are city-states given there's no governing body above them, and cities can be at war with each other. SerBear made a good point on this I think.
28. Mounts are going to be in Vehicles in the end :)