Merge "GUP: Fixed some typos and update some values"