More Tweaks

• Use maximum number of game instances instead of the mere possibility of having multiple instances.
• Do some linting.

As some imports were changed, please make sure that the code compiles with your version of base before merging.