I'd trade all of those fixes for the game's current iteration of an initiative system to wither and die.