SP - General Stop reinforcements spawning if army is retreating + Retreated armies are captured??

[Julio-Claudian]

When facing large armies who decide to retreat mid-battle you end up having to wait for their reinforcements to spawn and immediately start to leave the field. It'd make more sense if no more troops entered the battle, since the army is leaving it.

Also when an army attacks and then retreats from the battle, the whole army is captured. Could this be changed?