40.21/22/23 layouts, fix missing units

- layouts for 40.21, 40.22, 40.23
- fixes layouts for 40.20
- fixes #229 where units are sometimes excluded because DT thinks
they're zombies