Various Cleanups (game C-E)

(based on commit 83fe006)

(cleaned version of 6951330)

(based on commit 96075f3)

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