Thanks for the comment i will go over and try to fix those bugs!
Nice, it's a definite improvement! Unfortunately, I still ended up getting stuck - when challenging the Chief of Oranje, the game would instead initiate combat with whatever I was fighting last before that and after the combat ended, it did not progress further for me. Happened with both the mercenary and old man for me.