Fixing thruster tags

Nyankosensei pointed this out, Wave thruster tags were misplaced.
This fixes it, and adds a some more to places where it was justified.