Various Cleanups (game N-O)

(based on commit d72ba0f)

(cleaned version of 8ff2097)

(based on commit 739c3db)

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