new layout; thunderbolts added; scoring almost complete