Wrap field, random game, some refactoring, etc