Quarreling About Wells

Abraham vs. Abimelech
Genesis 21:22-34 I don't understand what happened. Abimelech took some of Abraham's wells, then Abraham confronted Abimelech. Then Abraham gave Abimelech some animals to commemorate the fact that new wells were dug that belonged to Abraham (or maybe reclaiming the old wells)? The animals were part of an oath. I think it makes more sense for Abimelech to be giving animals to Abraham, in apology for having seized wells that belonged to Abraham...? Oh well...

Isaac vs. Philistines (same Abimelech?)
Genesis 26:15-33 Philistines stopped the wells that Abraham's servants had dug. Isaac redug those wells and also dug new ones. So the same Abimelech and Phichol made an oath with Isaac (Abimelech and Phichol made an oath with Abraham in Genesis 21). The oath with Isaac is that Isaac would not harm them, as opposed to the oath with Abraham which was that Abraham gave them animals and claimed the wells as Abraham's. That's my understanding...