Some improvements mostly about engineers (191st Engineer Batallion), and general options.
1.- The 191 have 6 man team max but you have upgrades for 6 eng + 2 optional. So you can either go full engineer and mix by removing some. This could be improved simply by removing 1 of the extra eng upgrades and adding an extra team man. Making it 7 man crew and upgrades for 5 eng + 2 optional.
2.- Picking weapons with engineers replace the hammer, the hammer should either be put as equipment or picking a weapon should replace the main one.
Regarding toggable options.
3.- Have an option to auto switch to the next man in your squad when you die.
4.- Same as before but do it for being incapacitated. Sometimes is better to let the AI heal while you deal with a problem.
5.- Need an option to remove the transition between your soldiers, is sickening to see (like I am actually getting sick from that).