Update name of "injector", remove unneeded "controller", and adjust a few game values
Commit file misted in previous commit
Minor code reorganization