TAC AIR v2.1

Well, I found more issues with a few traits so I've uploaded another update...