Simplify techs filtering a bit
Simplify some other things