Wow, this helped a lot.

On the combat: my idea was disabling the turn based combat 100%, and only let the npc's attack each other without triggering the vanilla combat.