Fixes

Fixes 1787, 1781, and 1779.

For the squelch category, I just called it "Great Weapons" since I've never heard of any other name for them.