[Griefbringer]

And one more comment for now:

10.) Mortar section in infantry companies (many units)

In basic infantry companies (units 223-225) 60 mm mortar section is a separate sub-formation (1255). However, there are many rifle company variants where this mortar team is still part of the company HQ. This includes following formations:

226 - Co Team 42
227 - Co Team 43
228 - Co Team 45
234 - Mtn Inf Co 44
236 - Mtn Inf Co 45
239 - Co Team 46
240 - Co Tm 46 (2)
246 - Co Tm 42 (2)
247 - Co Tm 43 (2)
248 - Co Tm 45 (2)
249 - Co Team 44
450 - Inf Co (green)
451 - Inf Co (green)
452 - Inf Co (green)
454 - Veteran Inf Co
455 - Veteran Inf Co

With all of these formations, I would suggest making the mortar section into an independent sub-formation, rather than part of company HQ. (Though if you want to make an exception, maybe green companies could have it as part of company HQ, making them a bit unwieldier than the rest.)