Various Cleanups (game S)

(based on commit 92da1d8)

(cleaned version of 56d2d2d)

(based on commit e5c993d)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>