Various Cleanups (game P)

(based on commit f87c14e)

(cleaned version of e2c0f0f)

(based on commit 73838e0)

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