Game elements improvements (#1)