I also got rid of the "Sector" and "Gov" parts of the tokens, they were just pointless elongation.
Also fixes a typo and an incorrectly assigned variable.