Fixing misc problems

- Mostly reverting RPG changes
- Wrong RIG was upgraded