Singleton fix, constants fix

Made game singleton proper format, did some changes to var names on some
of the constants.