diff --git a/po/bygfoot.pot b/po/bygfoot.pot
index 8f33e8c8..b70d6279 100644
--- a/po/bygfoot.pot
+++ b/po/bygfoot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-17 10:58+0200\n"
+"POT-Creation-Date: 2005-06-17 14:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,108 +16,108 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/callback_func.c:281
+#: src/callback_func.c:285
 msgid "The bank doesn't grant you more money."
 msgstr ""
 
-#: src/callback_func.c:287
+#: src/callback_func.c:291
 #, c-format
 msgid "You can take out at most %s."
 msgstr ""
 
-#: src/callback_func.c:289
+#: src/callback_func.c:293
 msgid "Loan"
 msgstr ""
 
-#: src/callback_func.c:301
+#: src/callback_func.c:305
 msgid "You are not indebted."
 msgstr ""
 
-#: src/callback_func.c:307
+#: src/callback_func.c:311
 msgid "You don't have enough money to pay back."
 msgstr ""
 
-#: src/callback_func.c:313
+#: src/callback_func.c:317
 #, c-format
 msgid "You can pay back at most %s"
 msgstr ""
 
-#: src/callback_func.c:315
+#: src/callback_func.c:319
 msgid "Payback"
 msgstr ""
 
-#: src/callback_func.c:337
+#: src/callback_func.c:341
 msgid "There are no offers for the player."
 msgstr ""
 
-#: src/callback_func.c:340
+#: src/callback_func.c:344
 msgid "There are some offers for the player which you will see next week."
 msgstr ""
 
-#: src/callback_func.c:349
+#: src/callback_func.c:353
 msgid " more"
 msgstr ""
 
-#: src/callback_func.c:351
+#: src/callback_func.c:355
 msgid " less"
 msgstr ""
 
-#: src/callback_func.c:353
+#: src/callback_func.c:357
 #, c-format
 msgid ""
 "%s would like to buy %s. They offer %s for him, which is %s than the "
 "player's value. Do you accept?"
 msgstr ""
 
-#: src/callback_func.c:379 src/callbacks.c:529
+#: src/callback_func.c:383 src/callbacks.c:529
 msgid "Your offer has been removed."
 msgstr ""
 
-#: src/callback_func.c:386
+#: src/callback_func.c:390
 msgid "Your roster is already full. You can't buy more players."
 msgstr ""
 
-#: src/callback_func.c:393
+#: src/callback_func.c:397
 #, c-format
 msgid ""
 "You offered a transfer fee of %s and a wage of %s for %s. The owners and the "
 "player are satisfied with your offer. Do you still want to buy the player?"
 msgstr ""
 
-#: src/callback_func.c:421
+#: src/callback_func.c:425
 #, c-format
 msgid "User %s didn't consider your offer yet."
 msgstr ""
 
-#: src/callback_func.c:429
+#: src/callback_func.c:433
 msgid ""
 "The player is locked (the team owners are considering an offer currently)."
 msgstr ""
 
-#: src/callback_func.c:434
+#: src/callback_func.c:438
 #, c-format
 msgid ""
 "You are making an offer for %s. Your scout's recommendations for value and "
 "wage are preset."
 msgstr ""
 
-#: src/callback_func.c:439
+#: src/callback_func.c:443
 msgid "Fee"
 msgstr ""
 
-#: src/callback_func.c:440 src/treeview.c:259 src/treeview.c:1749
+#: src/callback_func.c:444 src/treeview.c:259 src/treeview.c:1749
 msgid "Wage"
 msgstr ""
 
-#: src/callback_func.c:457
+#: src/callback_func.c:461
 msgid "You can't offer a new contract if the old one is still above 2 years."
 msgstr ""
 
-#: src/callback_func.c:462
+#: src/callback_func.c:466
 msgid "The player won't negotiate with you anymore."
 msgstr ""
 
-#: src/callback_func.c:476
+#: src/callback_func.c:480
 #, c-format
 msgid ""
 "You are negotiating with %s about a new contract. Pay attention to what "
@@ -127,7 +127,7 @@ msgid ""
 "Your scout's recommendations are preset:"
 msgstr ""
 
-#: src/callback_func.c:596
+#: src/callback_func.c:601
 #, c-format
 msgid ""
 "You want to fire %s. Since his contract expires in %.1f years, he demands a "
@@ -264,11 +264,11 @@ msgstr ""
 msgid "You have %d weeks to pay back the rest of your loan."
 msgstr ""
 
-#: src/fixture.c:793
+#: src/fixture.c:796
 msgid " p."
 msgstr ""
 
-#: src/fixture.c:795
+#: src/fixture.c:798
 msgid " e.t."
 msgstr ""
 
@@ -680,674 +680,674 @@ msgstr ""
 msgid "Next (W)"
 msgstr ""
 
-#: src/lg_commentary.c:84
+#: src/lg_commentary.c:85
 msgid "TT has changed their style to EX"
 msgstr ""
 
-#: src/lg_commentary.c:88
+#: src/lg_commentary.c:89
 msgid "TT has changed their boost to EX"
 msgstr ""
 
-#: src/lg_commentary.c:97
+#: src/lg_commentary.c:98
 msgid "P2 feeds the ball through to P1"
 msgstr ""
 
-#: src/lg_commentary.c:98
+#: src/lg_commentary.c:99
 msgid "P2 threads a great ball to P1 "
 msgstr ""
 
-#: src/lg_commentary.c:99
+#: src/lg_commentary.c:100
 msgid "Lovely pass from P2 releases P1"
 msgstr ""
 
-#: src/lg_commentary.c:100
+#: src/lg_commentary.c:101
 msgid "Long floating pass from P2 finds P1"
 msgstr ""
 
-#: src/lg_commentary.c:101
+#: src/lg_commentary.c:102
 msgid "Good passing move across the pitch and down the right"
 msgstr ""
 
-#: src/lg_commentary.c:102
+#: src/lg_commentary.c:103
 msgid "Quick passing move down the left"
 msgstr ""
 
-#: src/lg_commentary.c:103
+#: src/lg_commentary.c:104
 msgid "P2 cross controlled by P1 who slips past his man"
 msgstr ""
 
-#: src/lg_commentary.c:104
+#: src/lg_commentary.c:105
 msgid "Another decent move down the wing"
 msgstr ""
 
-#: src/lg_commentary.c:105
+#: src/lg_commentary.c:106
 msgid "P1 latches onto P2's pass"
 msgstr ""
 
-#: src/lg_commentary.c:106
+#: src/lg_commentary.c:107
 msgid "P2 needles ball through players and finds P1"
 msgstr ""
 
-#: src/lg_commentary.c:107
+#: src/lg_commentary.c:108
 msgid "P2 controls it with his chest and passes to P1"
 msgstr ""
 
-#: src/lg_commentary.c:108
+#: src/lg_commentary.c:109
 msgid "P2 heads the ball towards P1"
 msgstr ""
 
-#: src/lg_commentary.c:109
+#: src/lg_commentary.c:110
 msgid "P1 twisting and turning again"
 msgstr ""
 
-#: src/lg_commentary.c:110
+#: src/lg_commentary.c:111
 msgid "P1 rips through the midfield"
 msgstr ""
 
-#: src/lg_commentary.c:111
+#: src/lg_commentary.c:112
 msgid "P1 spins past his marker"
 msgstr ""
 
-#: src/lg_commentary.c:114
+#: src/lg_commentary.c:115
 msgid "P1 wins the ball with a perfectly timed challenge"
 msgstr ""
 
-#: src/lg_commentary.c:115
+#: src/lg_commentary.c:116
 msgid "Bad control by P2 lets P1 steal the ball off him"
 msgstr ""
 
-#: src/lg_commentary.c:116
+#: src/lg_commentary.c:117
 msgid "P1 takes the ball away from P2 with a sliding tackle"
 msgstr ""
 
-#: src/lg_commentary.c:117
+#: src/lg_commentary.c:118
 msgid "Loose ball falls to P1"
 msgstr ""
 
-#: src/lg_commentary.c:120
+#: src/lg_commentary.c:121
 msgid "Oww, nasty tackle on P1"
 msgstr ""
 
-#: src/lg_commentary.c:121
+#: src/lg_commentary.c:122
 msgid "Surely that's a sending off offence"
 msgstr ""
 
-#: src/lg_commentary.c:122
+#: src/lg_commentary.c:123
 msgid "P2 knocks over P1 with a double footed lunge"
 msgstr ""
 
-#: src/lg_commentary.c:123
+#: src/lg_commentary.c:124
 msgid "Crunching challenge on P1"
 msgstr ""
 
-#: src/lg_commentary.c:124
+#: src/lg_commentary.c:125
 msgid "P1 gets his legs taken away from him by P2"
 msgstr ""
 
-#: src/lg_commentary.c:125
+#: src/lg_commentary.c:126
 msgid "Slicing challenge by P2 on P1"
 msgstr ""
 
-#: src/lg_commentary.c:126
+#: src/lg_commentary.c:127
 msgid "Vicious tackle from P2 leaves P1 lying on the floor in agony"
 msgstr ""
 
-#: src/lg_commentary.c:127
+#: src/lg_commentary.c:128
 msgid "Ouch that's got to hurt"
 msgstr ""
 
-#: src/lg_commentary.c:128
+#: src/lg_commentary.c:129
 msgid "Extremely high boot from P2 sends P1 to the ground"
 msgstr ""
 
-#: src/lg_commentary.c:131
+#: src/lg_commentary.c:132
 msgid "P1 charges towards goal and shoots!"
 msgstr ""
 
-#: src/lg_commentary.c:132
+#: src/lg_commentary.c:133
 msgid "P1 spins and shoots"
 msgstr ""
 
-#: src/lg_commentary.c:133
+#: src/lg_commentary.c:134
 msgid "Long ball from P2 finds P1 at far post"
 msgstr ""
 
-#: src/lg_commentary.c:134
+#: src/lg_commentary.c:135
 msgid "P1 can't quite get it under control but his miss kick heads toward goal"
 msgstr ""
 
-#: src/lg_commentary.c:135
+#: src/lg_commentary.c:136
 msgid "P1 shoots from 22 yards looks like it's going wide"
 msgstr ""
 
-#: src/lg_commentary.c:136
+#: src/lg_commentary.c:137
 msgid "P1 dribbles into the box, turns inside the defence and fires"
 msgstr ""
 
-#: src/lg_commentary.c:137
+#: src/lg_commentary.c:138
 msgid "P1 cuts in from the left flank and shoots"
 msgstr ""
 
-#: src/lg_commentary.c:138
+#: src/lg_commentary.c:139
 msgid "P1 tries his luck from 30 yards"
 msgstr ""
 
-#: src/lg_commentary.c:139
+#: src/lg_commentary.c:140
 msgid "P1 arrows shot towards top left corner"
 msgstr ""
 
-#: src/lg_commentary.c:140
+#: src/lg_commentary.c:141
 msgid "P1 shoots from close range"
 msgstr ""
 
-#: src/lg_commentary.c:141
+#: src/lg_commentary.c:142
 msgid "Great ball from P2 sends P1 one on one with the goalkeeper"
 msgstr ""
 
-#: src/lg_commentary.c:142
+#: src/lg_commentary.c:143
 msgid "P1's overhead kick heads towards the top right hand corner"
 msgstr ""
 
-#: src/lg_commentary.c:143
+#: src/lg_commentary.c:144
 msgid ""
 "P1 spins past two defenders, wrong foots the keeper and back heels the ball "
 "towards goal"
 msgstr ""
 
-#: src/lg_commentary.c:144
+#: src/lg_commentary.c:145
 msgid "P2 lays the ball off to P1 who sends a rocket of a shot towards goal"
 msgstr ""
 
-#: src/lg_commentary.c:147
+#: src/lg_commentary.c:148
 msgid "Goal!!!"
 msgstr ""
 
-#: src/lg_commentary.c:148
+#: src/lg_commentary.c:149
 msgid "And the ball is smacked into the back of the net!!!"
 msgstr ""
 
-#: src/lg_commentary.c:149
+#: src/lg_commentary.c:150
 msgid "P1 scores!!!"
 msgstr ""
 
-#: src/lg_commentary.c:150
+#: src/lg_commentary.c:151
 msgid "And the ball flies straight past P2 and into the back of the net!!!"
 msgstr ""
 
-#: src/lg_commentary.c:151
+#: src/lg_commentary.c:152
 msgid "The ball flies past P2 and it's a goal!!!"
 msgstr ""
 
-#: src/lg_commentary.c:152
+#: src/lg_commentary.c:153
 msgid "P1 wheels away in celebration after a great goal sent the fans wild"
 msgstr ""
 
-#: src/lg_commentary.c:153
+#: src/lg_commentary.c:154
 msgid ""
 "P2's despairing dive can't keep P1's shot out and the ball is in the back of "
 "the net!!!"
 msgstr ""
 
-#: src/lg_commentary.c:154
+#: src/lg_commentary.c:155
 msgid "The dance ignites the fans, P1 celebrates in his own special fashion"
 msgstr ""
 
-#: src/lg_commentary.c:157
+#: src/lg_commentary.c:158
 msgid "P1 fired wide!"
 msgstr ""
 
-#: src/lg_commentary.c:158
+#: src/lg_commentary.c:159
 msgid "P1 should have squared the ball went alone and lashed wide"
 msgstr ""
 
-#: src/lg_commentary.c:159
+#: src/lg_commentary.c:160
 msgid "Defender clears"
 msgstr ""
 
-#: src/lg_commentary.c:160
+#: src/lg_commentary.c:161
 msgid "P1 curls ball over"
 msgstr ""
 
-#: src/lg_commentary.c:161
+#: src/lg_commentary.c:162
 msgid "Defender back to block just as it seemed to open up"
 msgstr ""
 
-#: src/lg_commentary.c:162
+#: src/lg_commentary.c:163
 msgid "P1 smacks into row Z"
 msgstr ""
 
-#: src/lg_commentary.c:163
+#: src/lg_commentary.c:164
 msgid "And the shot creeps just past the post"
 msgstr ""
 
-#: src/lg_commentary.c:166
+#: src/lg_commentary.c:167
 msgid "P2's fingertips flicks it wide"
 msgstr ""
 
-#: src/lg_commentary.c:167
+#: src/lg_commentary.c:168
 msgid "P2 forced to tip P1's shot over the crossbar"
 msgstr ""
 
-#: src/lg_commentary.c:168
+#: src/lg_commentary.c:169
 msgid ""
 "Great pace shown by P1 to get to the ball first but P2 produced superb block "
 "tackle"
 msgstr ""
 
-#: src/lg_commentary.c:169
+#: src/lg_commentary.c:170
 msgid "Low shot taken well to his left by P2"
 msgstr ""
 
-#: src/lg_commentary.c:170
+#: src/lg_commentary.c:171
 msgid "P2 makes a superb reflex save to tip wide"
 msgstr ""
 
-#: src/lg_commentary.c:171
+#: src/lg_commentary.c:172
 msgid "P2 runs at P1 and blocks shot with ankle"
 msgstr ""
 
-#: src/lg_commentary.c:172
+#: src/lg_commentary.c:173
 msgid "Easy save for the goalkeeper"
 msgstr ""
 
-#: src/lg_commentary.c:173
+#: src/lg_commentary.c:174
 msgid "Caught well by P2"
 msgstr ""
 
-#: src/lg_commentary.c:176
+#: src/lg_commentary.c:177
 msgid "It's a crowd of AT here as the whistle blows"
 msgstr ""
 
-#: src/lg_commentary.c:177
+#: src/lg_commentary.c:178
 msgid "We're under way"
 msgstr ""
 
-#: src/lg_commentary.c:178
+#: src/lg_commentary.c:179
 msgid "The two teams are greeted by a wall of noise as they take to the pitch"
 msgstr ""
 
-#: src/lg_commentary.c:179
+#: src/lg_commentary.c:180
 msgid ""
 "The crowd roars as the players run out from the tunnel to start the match"
 msgstr ""
 
-#: src/lg_commentary.c:180
+#: src/lg_commentary.c:181
 msgid "A cloudless day, gives the impression this match is going to sparkle"
 msgstr ""
 
-#: src/lg_commentary.c:181
+#: src/lg_commentary.c:182
 msgid "AT fans can't be wrong, this is the match we have all come to watch"
 msgstr ""
 
-#: src/lg_commentary.c:182
+#: src/lg_commentary.c:183
 msgid "The referee gets the nod from the linesman and we are away"
 msgstr ""
 
-#: src/lg_commentary.c:183
+#: src/lg_commentary.c:184
 msgid "The clash of the titans kicks off"
 msgstr ""
 
-#: src/lg_commentary.c:184
+#: src/lg_commentary.c:185
 msgid "The referees are ready, players set, the battle begins"
 msgstr ""
 
-#: src/lg_commentary.c:187
+#: src/lg_commentary.c:188
 msgid "It's half time"
 msgstr ""
 
-#: src/lg_commentary.c:188
+#: src/lg_commentary.c:189
 msgid "It's a RE at half time."
 msgstr ""
 
-#: src/lg_commentary.c:189
+#: src/lg_commentary.c:190
 msgid ""
 "It's a RE at half time, TL's manager has to find something special to spur "
 "his team on."
 msgstr ""
 
-#: src/lg_commentary.c:190
+#: src/lg_commentary.c:191
 msgid "TL heads into the tunnel to await the managers scolding"
 msgstr ""
 
-#: src/lg_commentary.c:191
+#: src/lg_commentary.c:192
 msgid "TW are just 45 minutes away from a stunning victory"
 msgstr ""
 
-#: src/lg_commentary.c:192
+#: src/lg_commentary.c:193
 msgid ""
 "TL's manager cops a rollicking from the fans as he turns from the dugout"
 msgstr ""
 
-#: src/lg_commentary.c:193
+#: src/lg_commentary.c:194
 msgid "There are two teams out there and only one of them is playing football"
 msgstr ""
 
-#: src/lg_commentary.c:196
+#: src/lg_commentary.c:197
 msgid "After a close match the game heads into extra time"
 msgstr ""
 
-#: src/lg_commentary.c:197
+#: src/lg_commentary.c:198
 msgid "It's still RE: extra time"
 msgstr ""
 
-#: src/lg_commentary.c:198
+#: src/lg_commentary.c:199
 msgid "After MI minutes it's still RE: extra time"
 msgstr ""
 
-#: src/lg_commentary.c:199
+#: src/lg_commentary.c:200
 msgid "Who will breakdown first, extra time it is"
 msgstr ""
 
-#: src/lg_commentary.c:200
+#: src/lg_commentary.c:201
 msgid "It's down to determination and fitness now as we head into extra time"
 msgstr ""
 
-#: src/lg_commentary.c:203
+#: src/lg_commentary.c:204
 msgid "Who would have thought MI minutes ago it would come down to this"
 msgstr ""
 
-#: src/lg_commentary.c:204
+#: src/lg_commentary.c:205
 msgid "And now we have the tense drama of a penalty shoot out"
 msgstr ""
 
-#: src/lg_commentary.c:205
+#: src/lg_commentary.c:206
 msgid "Two teams, equall till now in every respect,face off in penalties"
 msgstr ""
 
-#: src/lg_commentary.c:206
+#: src/lg_commentary.c:207
 msgid "The teams cant do it so now it's one on one. Striker against goalie"
 msgstr ""
 
-#: src/lg_commentary.c:209
+#: src/lg_commentary.c:210
 msgid "The match is over!"
 msgstr ""
 
-#: src/lg_commentary.c:210
+#: src/lg_commentary.c:211
 msgid "TW are triumphant!!!"
 msgstr ""
 
-#: src/lg_commentary.c:211
+#: src/lg_commentary.c:212
 msgid "The fans boo TL off the pitch"
 msgstr ""
 
-#: src/lg_commentary.c:212
+#: src/lg_commentary.c:213
 msgid "After MI minutes the match ends with a RE"
 msgstr ""
 
-#: src/lg_commentary.c:213
+#: src/lg_commentary.c:214
 msgid "The referee checks his watch and blows for full time"
 msgstr ""
 
-#: src/lg_commentary.c:214
+#: src/lg_commentary.c:215
 msgid "Well that's that. It ends RE"
 msgstr ""
 
-#: src/lg_commentary.c:215
+#: src/lg_commentary.c:216
 msgid "RE, what an astonishing result for TW"
 msgstr ""
 
-#: src/lg_commentary.c:218
-msgid "Ohh no, the ball ricocheted off P1 into the net"
-msgstr ""
-
 #: src/lg_commentary.c:219
-msgid ""
-"It's a pinball in the penalty box, finally spinning off P1 across the line"
+msgid "Ohh no, the ball ricocheted off P1 into the net"
 msgstr ""
 
 #: src/lg_commentary.c:220
 msgid ""
-"Oh that's a great shot and it's deflected off P1 and into the back of the net"
+"It's a pinball in the penalty box, finally spinning off P1 across the line"
 msgstr ""
 
 #: src/lg_commentary.c:221
 msgid ""
+"Oh that's a great shot and it's deflected off P1 and into the back of the net"
+msgstr ""
+
+#: src/lg_commentary.c:222
+msgid ""
 "P1 passes the ball back to his goalie, oh no the keepers missed it! It's an "
 "own goal by P1!"
 msgstr ""
 
-#: src/lg_commentary.c:222
+#: src/lg_commentary.c:223
 msgid "That little missunderstanding has cost TT a goal"
 msgstr ""
 
-#: src/lg_commentary.c:225
+#: src/lg_commentary.c:226
 msgid "P2 chips the ball towards P1 who heads the ball towards goal"
 msgstr ""
 
-#: src/lg_commentary.c:226
+#: src/lg_commentary.c:227
 msgid "Diving header by P1"
 msgstr ""
 
-#: src/lg_commentary.c:227
+#: src/lg_commentary.c:228
 msgid "He just floated in midair for ages then thunder heads it towards home"
 msgstr ""
 
-#: src/lg_commentary.c:230
+#: src/lg_commentary.c:231
 msgid "Sweet strike by P1, hits the post"
 msgstr ""
 
-#: src/lg_commentary.c:231
+#: src/lg_commentary.c:232
 msgid "And the shot glances wide off the post"
 msgstr ""
 
-#: src/lg_commentary.c:232
+#: src/lg_commentary.c:233
 msgid "I'm suprised the post has managed to withstand that cracking shot"
 msgstr ""
 
-#: src/lg_commentary.c:235
+#: src/lg_commentary.c:236
 msgid "Ball dinked over P2 but hit crossbar and bounced to safety"
 msgstr ""
 
-#: src/lg_commentary.c:236
+#: src/lg_commentary.c:237
 msgid "The ball smacks into the crossbar with P2 stranded"
 msgstr ""
 
-#: src/lg_commentary.c:237
+#: src/lg_commentary.c:238
 msgid ""
 "P2 seemed to be everywhere at once, finally tipping the ball off the crossbar"
 msgstr ""
 
-#: src/lg_commentary.c:240
+#: src/lg_commentary.c:241
 msgid "P1 steps up to take the penalty"
 msgstr ""
 
-#: src/lg_commentary.c:241
+#: src/lg_commentary.c:242
 msgid "P1 has a chance to score with a penalty kick"
 msgstr ""
 
-#: src/lg_commentary.c:242
+#: src/lg_commentary.c:243
 msgid ""
 "P1 has missed a penalty before but he now has a chance to redeem himself"
 msgstr ""
 
-#: src/lg_commentary.c:243
+#: src/lg_commentary.c:244
 msgid ""
 "You have to bury the nerves, swallow and concentrate when your taking "
 "penalties"
 msgstr ""
 
-#: src/lg_commentary.c:246
+#: src/lg_commentary.c:247
 msgid "Short free-kick from P1"
 msgstr ""
 
-#: src/lg_commentary.c:247
+#: src/lg_commentary.c:248
 msgid "P1 drives free kick low and hard"
 msgstr ""
 
-#: src/lg_commentary.c:248
+#: src/lg_commentary.c:249
 msgid "P1 takes free-kick quickly and curls around wall"
 msgstr ""
 
-#: src/lg_commentary.c:249
+#: src/lg_commentary.c:250
 msgid "P1 curls the free kick over the wall"
 msgstr ""
 
-#: src/lg_commentary.c:250
+#: src/lg_commentary.c:251
 msgid "Free kick: P1 plays the ball out wide"
 msgstr ""
 
-#: src/lg_commentary.c:251
+#: src/lg_commentary.c:252
 msgid "Free kick: P1 hits a long ball up the pitch"
 msgstr ""
 
-#: src/lg_commentary.c:252
+#: src/lg_commentary.c:253
 msgid "Free kick whipped across the face of goal by P1"
 msgstr ""
 
-#: src/lg_commentary.c:255
+#: src/lg_commentary.c:256
 msgid "P2 for dangerous slide tackle on P1"
 msgstr ""
 
-#: src/lg_commentary.c:256
+#: src/lg_commentary.c:257
 msgid "P2 for foul on P1"
 msgstr ""
 
-#: src/lg_commentary.c:257
+#: src/lg_commentary.c:258
 msgid "P2 for kicking ball away "
 msgstr ""
 
-#: src/lg_commentary.c:258
+#: src/lg_commentary.c:259
 msgid "P2 for time wasting"
 msgstr ""
 
-#: src/lg_commentary.c:259
+#: src/lg_commentary.c:260
 msgid "P2 for handball"
 msgstr ""
 
-#: src/lg_commentary.c:260
+#: src/lg_commentary.c:261
 msgid "P2 for stopping P1 taking a quick free-kick"
 msgstr ""
 
-#: src/lg_commentary.c:261
+#: src/lg_commentary.c:262
 msgid "P2 is booked for repeated dissent"
 msgstr ""
 
-#: src/lg_commentary.c:264
+#: src/lg_commentary.c:265
 msgid "P2 is reprimanded for high kicking"
 msgstr ""
 
-#: src/lg_commentary.c:265
+#: src/lg_commentary.c:266
 msgid "P2 is given his marching orders for contempt"
 msgstr ""
 
-#: src/lg_commentary.c:266
+#: src/lg_commentary.c:267
 msgid "P2 for malicious showing of studs"
 msgstr ""
 
-#: src/lg_commentary.c:267
+#: src/lg_commentary.c:268
 msgid "P2 for intentional handball"
 msgstr ""
 
-#: src/lg_commentary.c:268
+#: src/lg_commentary.c:269
 msgid "P2 is sent off for stopping a clear goal scoring opportunity"
 msgstr ""
 
-#: src/lg_commentary.c:269
+#: src/lg_commentary.c:270
 msgid "P2 has been red carded for punching P1"
 msgstr ""
 
-#: src/lg_commentary.c:270
+#: src/lg_commentary.c:271
 msgid "P2 for swearing at opposition fans"
 msgstr ""
 
-#: src/lg_commentary.c:273
+#: src/lg_commentary.c:274
 msgid ""
 "P2 fouls and the stretcher bearers come racing on with P1 lying in agony on "
 "the turf"
 msgstr ""
 
-#: src/lg_commentary.c:274
+#: src/lg_commentary.c:275
 msgid "Foul by P2; P1 seems to be injured... he might have to be substituted"
 msgstr ""
 
-#: src/lg_commentary.c:277
+#: src/lg_commentary.c:278
 msgid "P1 has been sent off"
 msgstr ""
 
-#: src/lg_commentary.c:280
+#: src/lg_commentary.c:281
 msgid "P1 will have to go off after what seems an ankle injury"
 msgstr ""
 
-#: src/lg_commentary.c:281
+#: src/lg_commentary.c:282
 msgid "P1 looks like he's badly injured"
 msgstr ""
 
-#: src/lg_commentary.c:284
+#: src/lg_commentary.c:285
 msgid "P1 has pulled a muscle but should be able to continue"
 msgstr ""
 
-#: src/lg_commentary.c:285
+#: src/lg_commentary.c:286
 msgid "P1 has picked up a slight knock"
 msgstr ""
 
-#: src/lg_commentary.c:286
+#: src/lg_commentary.c:287
 msgid ""
 "P1 has a large cut above his left eye but it has been patched up and he will "
 "be able to continue "
 msgstr ""
 
-#: src/lg_commentary.c:289
+#: src/lg_commentary.c:290
 msgid "TH is undergoing stadium problems"
 msgstr ""
 
-#: src/lg_commentary.c:290
+#: src/lg_commentary.c:291
 msgid "The floodlights have just gone out"
 msgstr ""
 
-#: src/lg_commentary.c:293
+#: src/lg_commentary.c:294
 msgid "The peasants are revolting"
 msgstr ""
 
-#: src/lg_commentary.c:294
+#: src/lg_commentary.c:295
 msgid "And the fans are throwing flares onto the pitch"
 msgstr ""
 
-#: src/lg_commentary.c:295
+#: src/lg_commentary.c:296
 msgid ""
 "The riot police have moved in to stop fighting between sets of oppostion "
 "supporters"
 msgstr ""
 
-#: src/lg_commentary.c:296
+#: src/lg_commentary.c:297
 msgid ""
 "A fan has managed to get onto the pitch and has begun to attack the referee"
 msgstr ""
 
-#: src/lg_commentary.c:297
+#: src/lg_commentary.c:298
 msgid "The fans pour onto the pitch in a full scale pitch invasion"
 msgstr ""
 
-#: src/lg_commentary.c:300
+#: src/lg_commentary.c:301
 msgid "Fire consumes TT's stadium"
 msgstr ""
 
-#: src/lg_commentary.c:301
+#: src/lg_commentary.c:302
 msgid "Away fans have set fire to the north stand"
 msgstr ""
 
-#: src/lg_commentary.c:302
+#: src/lg_commentary.c:303
 msgid "A flare chucked onto the touchline has started a massive blaze"
 msgstr ""
 
-#: src/lg_commentary.c:303
+#: src/lg_commentary.c:304
 msgid ""
 "A speaker has gone up in flames and the blaze spreading around the entire "
 "stadium"
 msgstr ""
 
-#: src/lg_commentary.c:306
+#: src/lg_commentary.c:307
 msgid "TT make a substitution, P1 comes on to replace P2"
 msgstr ""
 
-#: src/lg_commentary.c:307
+#: src/lg_commentary.c:308
 msgid "P2 goes off to applause from the fans, P1 replaces him"
 msgstr ""
 
-#: src/lg_commentary.c:308
+#: src/lg_commentary.c:309
 msgid "P2 is booed off the pitch as he is replaced by P1"
 msgstr ""
 
-#: src/lg_commentary.c:311
+#: src/lg_commentary.c:312
 msgid "TT has changed their structure to EX"
 msgstr ""
 
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "Remove user %s from the game?"
 msgstr ""
 
-#: src/misc2_interface.c:71 src/window.c:416
+#: src/misc2_interface.c:71 src/window.c:417
 msgid "Job offer"
 msgstr ""
 
@@ -1442,7 +1442,7 @@ msgstr ""
 msgid "Average skill:"
 msgstr ""
 
-#: src/misc2_interface.c:221 src/player.c:1071 src/treeview_helper.c:1083
+#: src/misc2_interface.c:221 src/player.c:1074 src/treeview_helper.c:1082
 msgid "OK"
 msgstr ""
 
@@ -2024,52 +2024,52 @@ msgid ""
 "this user starts a new game)"
 msgstr ""
 
-#: src/player.c:964
+#: src/player.c:967
 #, c-format
 msgid "%s's contract expires in %.1f years."
 msgstr ""
 
-#: src/player.c:1074
+#: src/player.c:1077
 msgid "Concussion"
 msgstr ""
 
-#: src/player.c:1077
+#: src/player.c:1080
 msgid "Pulled muscle"
 msgstr ""
 
-#: src/player.c:1080
+#: src/player.c:1083
 msgid "Hamstring"
 msgstr ""
 
-#: src/player.c:1083
+#: src/player.c:1086
 msgid "Groin injury"
 msgstr ""
 
-#: src/player.c:1086
+#: src/player.c:1089
 msgid "Fractured ankle"
 msgstr ""
 
-#: src/player.c:1089
+#: src/player.c:1092
 msgid "Broken rib"
 msgstr ""
 
-#: src/player.c:1092
+#: src/player.c:1095
 msgid "Broken leg"
 msgstr ""
 
-#: src/player.c:1095
+#: src/player.c:1098
 msgid "Broken ankle"
 msgstr ""
 
-#: src/player.c:1098
+#: src/player.c:1101
 msgid "Broken arm"
 msgstr ""
 
-#: src/player.c:1101
+#: src/player.c:1104
 msgid "Broken shoulder"
 msgstr ""
 
-#: src/player.c:1104
+#: src/player.c:1107
 msgid "Torn crucial ligament"
 msgstr ""
 
@@ -2078,77 +2078,77 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/team.c:501
+#: src/team.c:486
 msgid "ALL OUT DEFEND"
 msgstr ""
 
-#: src/team.c:503
+#: src/team.c:488
 msgid "DEFEND"
 msgstr ""
 
-#: src/team.c:505
+#: src/team.c:490
 msgid "BALANCED"
 msgstr ""
 
-#: src/team.c:507
+#: src/team.c:492
 msgid "ATTACK"
 msgstr ""
 
-#: src/team.c:509
+#: src/team.c:494
 msgid "ALL OUT ATTACK"
 msgstr ""
 
-#: src/team.c:516
+#: src/team.c:501
 msgid "ANTI"
 msgstr ""
 
-#: src/team.c:518
+#: src/team.c:503
 msgid "OFF"
 msgstr ""
 
-#: src/team.c:520
+#: src/team.c:505
 msgid "ON"
 msgstr ""
 
-#: src/team.c:971
+#: src/team.c:956
 #, c-format
 msgid "W  %d : %d"
 msgstr ""
 
-#: src/team.c:976
+#: src/team.c:961
 #, c-format
 msgid "L  %d : %d"
 msgstr ""
 
-#: src/team.c:980
+#: src/team.c:965
 #, c-format
 msgid "Dw %d : %d"
 msgstr ""
 
-#: src/team.c:989
+#: src/team.c:974
 #, c-format
 msgid "%s (H) "
 msgstr ""
 
-#: src/team.c:994
+#: src/team.c:979
 #, c-format
 msgid "<span background='%s' foreground='%s'>%s (A) </span> "
 msgstr ""
 
-#: src/team.c:1003
+#: src/team.c:988
 #, c-format
 msgid "%s (N) "
 msgstr ""
 
-#: src/team.c:1052
+#: src/team.c:1037
 msgid "Dw "
 msgstr ""
 
-#: src/team.c:1055
+#: src/team.c:1040
 msgid "L  "
 msgstr ""
 
-#: src/team.c:1057
+#: src/team.c:1042
 msgid "W  "
 msgstr ""
 
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "Goals (regular)"
 msgstr ""
 
-#: src/treeview.c:654 src/treeview_helper.c:732
+#: src/treeview.c:654 src/treeview_helper.c:731
 msgid "Shots"
 msgstr ""
 
@@ -2247,11 +2247,11 @@ msgstr ""
 msgid "Fouls"
 msgstr ""
 
-#: src/treeview.c:659 src/treeview_helper.c:733
+#: src/treeview.c:659 src/treeview_helper.c:732
 msgid "Yellows"
 msgstr ""
 
-#: src/treeview.c:660 src/treeview_helper.c:734
+#: src/treeview.c:660 src/treeview_helper.c:733
 msgid "Reds"
 msgstr ""
 
@@ -2439,7 +2439,7 @@ msgstr ""
 msgid "Latest results"
 msgstr ""
 
-#: src/treeview.c:1521 src/treeview.c:1981 src/treeview_helper.c:731
+#: src/treeview.c:1521 src/treeview.c:1981 src/treeview_helper.c:730
 msgid "Goals"
 msgstr ""
 
@@ -2558,69 +2558,69 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: src/treeview_helper.c:716
+#: src/treeview_helper.c:715
 msgid "Player doesn't negotiate anymore"
 msgstr ""
 
-#: src/treeview_helper.c:718
+#: src/treeview_helper.c:717
 msgid "Player accepts new offers"
 msgstr ""
 
-#: src/treeview_helper.c:730
+#: src/treeview_helper.c:729
 msgid "Games"
 msgstr ""
 
-#: src/treeview_helper.c:750
+#: src/treeview_helper.c:749
 #, c-format
 msgid ""
 "\n"
 "Goals/Game %.1f Save %% %.1f"
 msgstr ""
 
-#: src/treeview_helper.c:757
+#: src/treeview_helper.c:756
 #, c-format
 msgid ""
 "\n"
 "Goals/Game %.1f Shot %% %.1f"
 msgstr ""
 
-#: src/treeview_helper.c:780
+#: src/treeview_helper.c:779
 #, c-format
 msgid "%s: %d weeks\n"
 msgstr ""
 
-#: src/treeview_helper.c:815
+#: src/treeview_helper.c:814
 #, c-format
 msgid "%s: %d (no limit)\n"
 msgstr ""
 
-#: src/treeview_helper.c:964
+#: src/treeview_helper.c:963
 msgid " (P)"
 msgstr ""
 
-#: src/treeview_helper.c:1069
+#: src/treeview_helper.c:1068
 #, c-format
 msgid "INJ(%d)"
 msgstr ""
 
-#: src/treeview_helper.c:1078
+#: src/treeview_helper.c:1077
 #, c-format
 msgid "BAN(%d)"
 msgstr ""
 
-#: src/treeview_helper.c:1150
+#: src/treeview_helper.c:1149
 msgid "G"
 msgstr ""
 
-#: src/treeview_helper.c:1157
+#: src/treeview_helper.c:1156
 msgid "D"
 msgstr ""
 
-#: src/treeview_helper.c:1164
+#: src/treeview_helper.c:1163
 msgid "M"
 msgstr ""
 
-#: src/treeview_helper.c:1171
+#: src/treeview_helper.c:1170
 msgid "F"
 msgstr ""
 
@@ -2701,74 +2701,74 @@ msgstr ""
 msgid "Your roster is full. You couldn't buy %s from %s."
 msgstr ""
 
-#: src/user.c:488
+#: src/user.c:470
 #, c-format
 msgid ""
 "%s's injury was so severe that he can't play football on a professional "
 "level anymore. He leaves your team."
 msgstr ""
 
-#: src/user.c:491
+#: src/user.c:473
 msgid " Fortunately he's got a cousin who can help your team out."
 msgstr ""
 
-#: src/user.c:673
+#: src/user.c:655
 #, c-format
 msgid "You start the game with %s in the %s."
 msgstr ""
 
-#: src/user.c:678
+#: src/user.c:660
 #, c-format
 msgid ""
 "%s fires you because of financial mismanagement.\n"
 "You find a new job with %s in the %s."
 msgstr ""
 
-#: src/user.c:684
+#: src/user.c:666
 #, c-format
 msgid ""
 "%s fires you because of unsuccessfulness.\n"
 "You find a new job with %s in the %s."
 msgstr ""
 
-#: src/user.c:690
+#: src/user.c:672
 #, c-format
 msgid ""
 "%s offer you a job in the %s.\n"
 "You accept the challenge and leave %s."
 msgstr ""
 
-#: src/user.c:696
+#: src/user.c:678
 #, c-format
 msgid "You finish the season in the %s on rank %d."
 msgstr ""
 
-#: src/user.c:701
+#: src/user.c:683
 #, c-format
 msgid "You get promoted to the %s."
 msgstr ""
 
-#: src/user.c:705
+#: src/user.c:687
 #, c-format
 msgid "You get relegated to the %s."
 msgstr ""
 
-#: src/user.c:709
+#: src/user.c:691
 #, c-format
 msgid "You win the %s final against %s."
 msgstr ""
 
-#: src/user.c:714
+#: src/user.c:696
 #, c-format
 msgid "You lose in the %s final against %s."
 msgstr ""
 
-#: src/user.c:720
+#: src/user.c:702
 #, c-format
 msgid "You reach the %s (round %d) of the %s."
 msgstr ""
 
-#: src/user.c:725
+#: src/user.c:707
 #, c-format
 msgid "You are champion of the %s!"
 msgstr ""
@@ -2777,15 +2777,15 @@ msgstr ""
 msgid "No improvements currently in progress."
 msgstr ""
 
-#: src/window.c:338
+#: src/window.c:339
 #, c-format
 msgid "Welcome to Bygfoot %s"
 msgstr ""
 
-#: src/window.c:394
+#: src/window.c:395
 msgid "Numbers..."
 msgstr ""
 
-#: src/window.c:405
+#: src/window.c:406
 msgid "Your stadium"
 msgstr ""
diff --git a/src/Makefile.am b/src/Makefile.am
index 41631d2a..c2aefbaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ bygfoot_SOURCES = \
 	gui.c gui.h misc.h support.h variables.h window.h \
 	interface.c callbacks.h interface.h support.h \
 	language.c callbacks.h free.h language.h misc.h option.h variables.h window.h \
-	lg_commentary.c free.h lg_commentary.h live_game.h misc.h option.h player.h variables.h \
+	lg_commentary.c free.h lg_commentary.h live_game.h main.h  misc.h option.h player.h variables.h \
 	league.c cup.h league.h main.h maths.h misc.h option.h player.h stat.h table.h team.h user.h variables.h \
 	live_game.c callbacks.h fixture.h free.h game.h game_gui.h lg_commentary.h live_game.h league.h main.h maths.h misc_callback_func.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \
 	load_save.c callbacks.h file.h game_gui.h gui.h load_save.h option.h support.h user.h variables.h xml_loadsave_misc.h xml_loadsave_cup.h xml_loadsave_league.h xml_loadsave_season_stats.h xml_loadsave_transfers.h xml_loadsave_users.h xml.h \
diff --git a/src/bygfoot.h b/src/bygfoot.h
index 511e4939..47ad82f2 100644
--- a/src/bygfoot.h
+++ b/src/bygfoot.h
@@ -81,6 +81,8 @@ enum ExitCodes
     EXIT_OPTION_NOT_FOUND, /**< An option couldn't be found. */
     EXIT_POINTER_NOT_FOUND, /**< We didn't find a pointer needed. */
     EXIT_INT_NOT_FOUND, /**< We didn't find an integer value (mostly indices). */
+    EXIT_NO_SUPPORT_DIR, /**< No support directory found. */
+    EXIT_CUP_ROUND_ERROR, /**< Too few cup rounds. */
     EXIT_END
 };
 
diff --git a/src/callback_func.c b/src/callback_func.c
index 88ae6a38..09b62818 100644
--- a/src/callback_func.c
+++ b/src/callback_func.c
@@ -193,6 +193,7 @@ callback_show_fixtures_week(gint type)
     {
 	default:
 	    g_warning("callback_show_fixtures_week: unknown type %d \n", type);
+	    return;
 	    break;
 	case SHOW_CURRENT:
 	    if(week == 1 && week_round == 1)
@@ -261,7 +262,10 @@ callback_show_tables(gint type)
 	    clid = league_cup_get_previous_clid(clid);
     }
     else
+    {
 	g_warning("callback_show_tables: unknown type %d \n", type);
+	return;
+    }
 
     stat1 = clid;    
 
@@ -565,6 +569,7 @@ callback_show_player_list(gint type)
     {
 	default:
 	    g_warning("callback_show_player_list: unknown type %d \n", type);
+	    return;
 	    break;
 	case SHOW_CURRENT:
 	    stat1 = current_user.tm->clid;
@@ -607,6 +612,7 @@ callback_show_league_stats(gint type)
     {
 	default:
 	    g_warning("callback_show_league_stats: unknown type %d \n", type);
+	    return;
 	    break;
 	case SHOW_CURRENT:
 	    stat1 = current_user.tm->clid;
@@ -634,6 +640,7 @@ callback_show_season_history(gint type)
     {
 	default:
 	    g_warning("callback_show_season_history: unknown type %d \n", type);
+	    return;
 	    break;
 	case SHOW_CURRENT:
 	    stat1 = -1;
diff --git a/src/cup.c b/src/cup.c
index f5eab5a5..701a4319 100644
--- a/src/cup.c
+++ b/src/cup.c
@@ -724,7 +724,7 @@ cup_from_clid(gint clid)
 
     g_warning("cup_from_clid: didn't find cup with id %d\n", clid);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -741,7 +741,7 @@ cup_from_sid(const gchar *sid)
 
     g_warning("cup_from_sid: didn't find cup with sid %s \n", sid);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
diff --git a/src/cup.h b/src/cup.h
index 63f35460..2dabbbb1 100644
--- a/src/cup.h
+++ b/src/cup.h
@@ -63,18 +63,12 @@ cup_get_teams_sorted(const Cup *cup);
 gint
 cup_compare_success_tables(const Team *tm1, const Team *tm2, const Cup *cup, gint round);
 
-GPtrArray*
-cup_get_teams_from_names(GPtrArray *team_names);
-
 gint
 cup_compare_success(gconstpointer a, gconstpointer b, gpointer data);
 
 gint
 cup_get_round_reached(const Team *tm, const GArray *fixtures);
 
-GPtrArray*
-cup_get_choose_teams_pointers(Cup *cup);
-
 gboolean
 query_cup_begins(const Cup *cup);
 
diff --git a/src/file.c b/src/file.c
index 138ca942..635a38fa 100644
--- a/src/file.c
+++ b/src/file.c
@@ -491,7 +491,8 @@ file_get_first_support_dir(void)
 	elem = elem->next;
     }
 
-    g_warning("file_get_first_support_dir: no primary support dir found.");
+    main_exit_program(EXIT_NO_SUPPORT_DIR,
+		      "file_get_first_support_dir: no primary support dir found.");
 
     return NULL;
 }
diff --git a/src/file.h b/src/file.h
index 33bfaf21..ad9ac7c8 100644
--- a/src/file.h
+++ b/src/file.h
@@ -23,9 +23,6 @@ file_save_opt_file(const gchar *filename, OptionList *optionlist);
 GPtrArray*
 file_dir_get_contents(const gchar *dir_name, const gchar *prefix, const gchar *suffix);
 
-void
-file_get_player_names(gint number_of_names);
-
 gboolean
 file_my_fopen(const gchar *filename, gchar *bits, FILE **fil, gboolean abort_program);
 
diff --git a/src/fixture.c b/src/fixture.c
index 7ba7f3a4..b079b961 100644
--- a/src/fixture.c
+++ b/src/fixture.c
@@ -73,8 +73,11 @@ fixture_update(Cup *cup)
         return;
 
     if(round + 1 > cup->rounds->len - 1)
+    {
 	g_warning("fixture_update: round index %d too high for round array (%d) in cup %s\n",
 		  round + 1, cup->rounds->len - 1, cup->name->str);
+	main_exit_program(EXIT_CUP_ROUND_ERROR, NULL);
+    }
 
     new_round = &g_array_index(cup->rounds, CupRound, round + 1);
 
@@ -1048,27 +1051,6 @@ fixture_get_matches(const Team *tm1, const Team *tm2)
     return matches;
 }
 
-/** Return the matches the teams play in their league. */
-GPtrArray*
-fixture_get_league_matches(const Team *tm1, const Team *tm2)
-{
-    gint i, j;
-    GPtrArray *matches = g_ptr_array_new();
-
-    for(i=0;i<ligs->len;i++)
-	if(lig(i).id == tm1->clid)
-	    for(j=0;j<lig(i).fixtures->len;j++)
-	    {
-		if((g_array_index(lig(i).fixtures, Fixture, j).teams[0] == tm1 &&
-		    g_array_index(lig(i).fixtures, Fixture, j).teams[1] == tm2) ||
-		   (g_array_index(lig(i).fixtures, Fixture, j).teams[0] == tm2 &&
-		    g_array_index(lig(i).fixtures, Fixture, j).teams[1] == tm1))
-		    g_ptr_array_add(matches, &g_array_index(lig(i).fixtures, Fixture, j));
-	    }
-
-    return matches;
-}
-
 /** Return the fixture going with the id. */
 Fixture*
 fixture_from_id(gint id)
@@ -1087,43 +1069,11 @@ fixture_from_id(gint id)
 
     g_warning("fixture_from_id: fixture with id %d found \n", id);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
 
-/** Move teams from upper leagues to the beginning of the 
-    array so that they get the bye. 
-    @param teams The randomised array of teams.
-    @param bye_len The number of teams that get a bye.
-    @return A new array. */
-void
-fixture_sort_teams_bye(GPtrArray *teams, gint bye_len)
-{
-    gint i, j, moved = 0;
-    GPtrArray *new_array = g_ptr_array_new();
-
-    for(i=0;i<ligs->len;i++)
-	for(j=teams->len - 1; j >= 0; j--)
-	    if(((Team*)g_ptr_array_index(teams, j))->clid == lig(i).id && moved < bye_len)
-	    {
-		g_ptr_array_add(new_array, g_ptr_array_index(teams, j));
-		g_ptr_array_remove_index(teams, j);
-		moved++;
-	    }
-	    else if(moved == bye_len)
-	    {
-		break;
-		break;
-	    }
-
-    for(i=0;i<new_array->len;i++)
-	g_ptr_array_add(teams, g_ptr_array_index(new_array, i));
-
-    g_ptr_array_free(new_array, TRUE);
-}
-
-
 /** Return the last week round number of the specified week. */
 gint
 fixture_get_last_week_round(gint week_number)
diff --git a/src/fixture.h b/src/fixture.h
index 986ebc7e..67475b19 100644
--- a/src/fixture.h
+++ b/src/fixture.h
@@ -107,18 +107,12 @@ fixture_compare_func(gconstpointer a, gconstpointer b, gpointer data);
 GPtrArray*
 fixture_get_matches(const Team *tm1, const Team *tm2);
 
-GPtrArray*
-fixture_get_league_matches(const Team *tm1, const Team *tm2);
-
 GPtrArray*
 fixture_get_coming(const Team *tm);
 
 Fixture*
 fixture_from_id(gint id);
 
-void
-fixture_sort_teams_bye(GPtrArray *teams, gint bye_len);
-
 gint
 fixture_get_last_week_round(gint week_number);
 
diff --git a/src/free.h b/src/free.h
index 279b8e61..e67f77dc 100644
--- a/src/free.h
+++ b/src/free.h
@@ -49,9 +49,6 @@ free_cups_array(GArray **cups, gboolean reset);
 void
 free_cup(Cup *cup);
 
-void
-free_cup_tables(GArray *tables, gboolean reset);
-
 void
 free_cup_choose_team(CupChooseTeam *cup_choose_team);
 
diff --git a/src/game.c b/src/game.c
index 59b9458d..dc1ddcfd 100644
--- a/src/game.c
+++ b/src/game.c
@@ -130,7 +130,10 @@ game_get_player(const Team *tm, gint player_type,
     else if(player_type == GAME_PLAYER_TYPE_PENALTY)
 	return game_get_penalty_taker(tm, last_penalty);
     else
+    {
 	g_warning("game_get_player: unknown player type %d\n", player_type);
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
+    }
 
     game_get_player_probs(tm->players, probs, weights, skills);
 
@@ -160,7 +163,7 @@ game_get_player(const Team *tm, gint player_type,
 		   player_of_idx_team(tm, i)->health, player_of_idx_team(tm, i)->cskill);
 	}
 
-	main_exit_program(EXIT_INT_NOT_FOUND, "");
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 	return -1;
     }
 
diff --git a/src/gui.c b/src/gui.c
index f3254b8b..527babbc 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -30,28 +30,6 @@ gui_label_set_text_from_int(GtkLabel *label, gint number, gboolean append)
     gtk_label_set_text(label, buf2);
 }
 
-/* Set into or append an integer into a label.
-   @param label The label.
-   @param number The number.
-   @param append Whether or not to append.
-   @param precision Float precision to use. */
-void
-gui_label_set_text_from_float(GtkLabel *label, gfloat number,
-			      gboolean append, gint precision)
-{
-    const gchar *current_text = gtk_label_get_text(label);
-    gchar buf[SMALL];
-    
-    strcpy(buf, "");
-
-    if(!append)
-	sprintf(buf, "%.*f", precision, number);
-    else
-	sprintf(buf, "%s%.*f", current_text, precision, number);
-
-    gtk_label_set_text(label, buf);
-}
-
 /* Show a window with a progress bar.
    @param value The value of the progress bar. If set to 1
    or < 0 the progress bar window gets destroyed.
diff --git a/src/gui.h b/src/gui.h
index 21486b38..de2a7764 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -6,10 +6,6 @@
 void
 gui_label_set_text_from_int(GtkLabel *label, gint number, gboolean append);
 
-void
-gui_label_set_text_from_float(GtkLabel *label, gfloat number,
-			      gboolean append, gint precision);
-
 void
 gui_show_progress(gfloat value, gchar *text);
 
diff --git a/src/language.h b/src/language.h
index fa312045..164f78e5 100644
--- a/src/language.h
+++ b/src/language.h
@@ -9,9 +9,6 @@
 gint
 language_get_code_index(const gchar *code);
 
-void
-language_get_code_name(const gchar *string, gboolean to_name, gchar *buf);
-
 void
 language_set(gint index);
 
diff --git a/src/league.c b/src/league.c
index d3c1cc74..7436c3ed 100644
--- a/src/league.c
+++ b/src/league.c
@@ -99,7 +99,10 @@ league_cup_get_index_from_clid(gint clid)
 	    }
 
     if(index == -1)
+    {
 	g_warning("league_cup_get_index_from_clid: couldn't find league or cup with id %d\n", clid);
+	main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
+    }
 
     return index;
 }
@@ -118,7 +121,7 @@ league_from_clid(gint clid)
 
     g_warning("league_from_clid: didn't find league with id %d\n", clid);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -274,7 +277,7 @@ league_index_from_sid(const gchar *sid)
 
     g_warning("league_index_from_sid: no index found for sid '%s'.\n", sid);
 
-    main_exit_program(EXIT_INT_NOT_FOUND, "");
+    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
     return -1;
 }
diff --git a/src/league.h b/src/league.h
index 2639e9ba..cd590e95 100644
--- a/src/league.h
+++ b/src/league.h
@@ -19,9 +19,6 @@ league_new(gboolean new_id);
 PromRelElement
 prom_rel_element_new(void);
 
-TableElement
-league_table_element_new(Team *team);
-
 gint
 league_cup_get_index_from_clid(gint clid);
 
@@ -40,9 +37,6 @@ league_cup_get_next_fixture(gint clid, gint week_number, gint week_round_number)
 Fixture*
 league_cup_get_previous_fixture(gint clid, gint week_number, gint week_round_number);
 
-gint
-league_get_index(gint clid);
-
 gint
 league_cup_average_capacity(gint clid);
 
diff --git a/src/lg_commentary.c b/src/lg_commentary.c
index 1bc3efe2..d52eed1c 100644
--- a/src/lg_commentary.c
+++ b/src/lg_commentary.c
@@ -1,6 +1,7 @@
 #include "free.h"
 #include "lg_commentary.h"
 #include "live_game.h"
+#include "main.h"
 #include "misc.h"
 #include "option.h"
 #include "player.h"
@@ -440,8 +441,11 @@ lg_commentary_get_player_name(const LiveGameUnit *unit, const Fixture *fix, gboo
 	    player_get_last_name(player_of_id_team(fix->teams[unit->event.team],
 						   unit->event.player)->name->str);
     else
+    {
 	g_warning("lg_commentary_get_player_name: unknown event type %d\n",
 		  unit->event.type);
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
+    }
 
     return return_value;
 }
diff --git a/src/live_game.c b/src/live_game.c
index cefad611..fdffa6cc 100644
--- a/src/live_game.c
+++ b/src/live_game.c
@@ -699,8 +699,11 @@ live_game_event_general(gboolean create_new)
 	    new.area = LIVE_GAME_UNIT_AREA_MIDFIELD;
 	}
 	else
+	{
 	    g_warning("live_game_event_general: unknown event type: %d\n",
 		      last_unit.event.type);
+	    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
+	}
 	
 	g_array_append_val(unis, new);
     }
@@ -1164,7 +1167,8 @@ live_game_unit_get_minute(const LiveGameUnit *unit)
 	    break;
 
     if(i == -1)
-	g_warning("live_game_unit_get_minute: reached end of unis array.\n");
+	main_exit_program(EXIT_INT_NOT_FOUND,
+			  "live_game_unit_get_minute: reached end of units array.");
     else
 	for(j=i;j>=0;j--)
 	    if(uni(j).minute != -1)
@@ -1204,7 +1208,7 @@ live_game_unit_before(const LiveGameUnit* unit, gint gap)
 	    }
     }
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -1455,7 +1459,7 @@ live_game_reset(LiveGame *live_game, Fixture *fix, gboolean free_variable)
 gint
 live_game_event_get_verbosity(gint event_type)
 {
-    gint return_value;
+    gint return_value = -1;
 
     if(event_type == LIVE_GAME_EVENT_START_MATCH ||
        event_type == LIVE_GAME_EVENT_HALF_TIME ||
@@ -1505,7 +1509,7 @@ live_game_event_get_verbosity(gint event_type)
     {
 	g_warning("live_game_event_get_verbosity: unknown event type %d \n",
 		  event_type);
-	return_value = -1;
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
     }
 
     return return_value;
diff --git a/src/live_game.h b/src/live_game.h
index 263b2a03..48c39cc6 100644
--- a/src/live_game.h
+++ b/src/live_game.h
@@ -64,9 +64,6 @@ live_game_event_free_kick(void);
 void
 live_game_event_send_off(gint team, gint player, gboolean second_yellow);
 
-void
-live_game_generate_commentary(LiveGameUnit *unit);
-
 void
 live_game_event_duel(void);
 
@@ -79,9 +76,6 @@ live_game_reset(LiveGame *live_game, Fixture *fix, gboolean free_variable);
 gint
 live_game_unit_get_minute(const LiveGameUnit *unit);
 
-void
-live_game_create_stats(void);
-
 gint
 live_game_get_area(const LiveGameUnit *unit);
 
diff --git a/src/option.c b/src/option.c
index 567361aa..800b9d09 100644
--- a/src/option.c
+++ b/src/option.c
@@ -17,7 +17,7 @@ option_string(const gchar *name, OptionList *optionlist)
     else
 	return ((Option*)element)->string_value->str;
 
-    main_exit_program(EXIT_OPTION_NOT_FOUND, "");
+    main_exit_program(EXIT_OPTION_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -33,7 +33,7 @@ option_string_pointer(const gchar *name, OptionList *optionlist)
     else
 	return ((Option*)element)->string_value;
 
-    main_exit_program(EXIT_OPTION_NOT_FOUND, "");
+    main_exit_program(EXIT_OPTION_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -53,7 +53,7 @@ option_int(const gchar *name, OptionList *optionlist)
     else
 	return ((Option*)element)->value;
 
-    main_exit_program(EXIT_OPTION_NOT_FOUND, "");
+    main_exit_program(EXIT_OPTION_NOT_FOUND, NULL);
 
     return -1;
 }
@@ -69,7 +69,7 @@ option_int_pointer(const gchar *name, OptionList *optionlist)
     else
 	return &((Option*)element)->value;
 
-    main_exit_program(EXIT_OPTION_NOT_FOUND, "");
+    main_exit_program(EXIT_OPTION_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -89,7 +89,7 @@ option_float(const gchar *name, OptionList *optionlist)
     else
 	return (gfloat)((Option*)element)->value / 10000;
 
-    main_exit_program(EXIT_OPTION_NOT_FOUND, "");
+    main_exit_program(EXIT_OPTION_NOT_FOUND, NULL);
 
     return -1;
 }
diff --git a/src/player.c b/src/player.c
index 59fa32c7..ff44349a 100644
--- a/src/player.c
+++ b/src/player.c
@@ -212,7 +212,7 @@ player_id_index(const Team *tm, gint player_id)
     
     g_warning("player_id_index: didn't find player with id %d of team %s\n", player_id, tm->name->str);
     
-    main_exit_program(EXIT_INT_NOT_FOUND, "");
+    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
     return -1;
 }
@@ -229,7 +229,7 @@ player_of_idx_team(const Team *tm, gint number)
 	g_warning("player_of_idx_team: Player list of team %s too short for number %d.\n",
 		  tm->name->str, number);
 
-	main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+	main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
 	return NULL;
     }
@@ -253,7 +253,7 @@ player_of_id_team(const Team *tm, gint id)
     
     g_warning("player_of_id_team: didn't find player with id %d of team %s\n", id, tm->name->str);
     
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -777,7 +777,10 @@ player_games_goals_get(const Player *pl, gint clid, gint type)
 	    else if(type == PLAYER_VALUE_SHOTS)
 		return_value = g_array_index(pl->games_goals, PlayerGamesGoals, i).shots;
 	    else
+	    {
 		g_warning("player_games_goals_get: unknown type %d.\n", type);
+		main_exit_program(EXIT_INT_NOT_FOUND, NULL);
+	    }
 	}
 
     return return_value;
diff --git a/src/player.h b/src/player.h
index ead62b12..ce595b13 100644
--- a/src/player.h
+++ b/src/player.h
@@ -16,9 +16,6 @@ enum PlayerCompareAttrib
 Player
 player_new(Team *tm, gfloat average_skill, gboolean new_id);
 
-gint
-player_new_id(const GArray *players);
-
 gint
 player_get_position_from_structure(gint structure, gint player_number);
 
diff --git a/src/team.c b/src/team.c
index 8951be7e..c1f47d6f 100644
--- a/src/team.c
+++ b/src/team.c
@@ -86,22 +86,6 @@ team_assign_playing_structure(void)
   return 343;
 }
 
-/** Return a stadium struct with default values. */
-Stadium
-team_stadium_new(void)
-{
-    Stadium new;
-
-    new.capacity = -1;
-    new.safety = 0;
-
-    new.average_attendance = 
-	new.possible_attendance = 
-	new.games = 0;
-
-    return new;
-}
-
 /* Fill the players array of the team and the stadium.
    @param tm The team that gets filled. */
 void
@@ -223,7 +207,7 @@ team_of_id(gint id)
 
     g_warning("team_of_id: team with id %d not found.", id);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -397,7 +381,7 @@ team_get_league_rank(const Team *tm)
     g_warning("team_get_league_rank: no rank found for team %s in league %s. \n",
 	      tm->name->str, league_cup_get_name_string(tm->clid));
 
-    main_exit_program(EXIT_INT_NOT_FOUND, "");
+    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
     return -1;
 }
@@ -417,7 +401,7 @@ team_get_cup_rank(const Team *tm, const CupRound *cupround)
 
     g_warning("team_get_cup_rank: no rank found for team %s. \n ", tm->name->str);
 
-    main_exit_program(EXIT_INT_NOT_FOUND, "");
+    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
     return -1;
 }
@@ -493,6 +477,7 @@ team_attribute_to_char(gint attribute, gint value)
     {
 	default:
 	    g_warning("team_attribute_to_char: unknown attribute %d\n", attribute);
+	    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 	    break;
 	case TEAM_ATTRIBUTE_STYLE:
 	    switch(value)
@@ -722,7 +707,7 @@ team_get_table_value(const Team *tm, gint type)
     {
 	g_warning("team_get_table_value: team is not a league team: %s \n", tm->name->str);
 
-	main_exit_program(EXIT_INT_NOT_FOUND, "");
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
 	return -1;
     }
@@ -737,7 +722,7 @@ team_get_table_value(const Team *tm, gint type)
     {
 	g_warning("team_get_table_value: table entry not found for team %s \n", tm->name->str);
 
-	main_exit_program(EXIT_INT_NOT_FOUND, "");
+	main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
 	return -1;
     }
@@ -901,7 +886,7 @@ team_get_index(const Team *tm)
 
     g_warning("team_get_index: team %s not found.\n", tm->name->str);
 
-    main_exit_program(EXIT_INT_NOT_FOUND, "");
+    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 
     return -1;
 }
diff --git a/src/team.h b/src/team.h
index 12451498..841cafb1 100644
--- a/src/team.h
+++ b/src/team.h
@@ -36,9 +36,6 @@ team_assign_playing_structure(void);
 gint
 team_assign_playing_style(void);
 
-Stadium
-team_stadium_new(void);
-
 gboolean
 query_is_my_team(const Team *tm);
 
diff --git a/src/treeview.c b/src/treeview.c
index 1a437d89..7a74507b 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -89,7 +89,7 @@ treeview_create_team_selection_list(gboolean show_cup_teams, gboolean show_user_
    @param treeview The treeview that gets configured.
 */
 void
-treeview_set_up_team_selection_treeview (GtkTreeView *treeview)
+treeview_set_up_team_selection_treeview(GtkTreeView *treeview)
 {
     GtkTreeViewColumn   *col;
     GtkCellRenderer     *renderer;
@@ -235,8 +235,8 @@ treeview_create_player_list(GPtrArray *players, gint *attributes, gint max,
 
 /** Set up the tree view for a player list */
 void
-treeview_set_up_player_list (GtkTreeView *treeview, gint *attributes, gint max,
-			     gboolean show_separator, gboolean sortable)
+treeview_set_up_player_list(GtkTreeView *treeview, gint *attributes, gint max,
+			    gboolean show_separator, gboolean sortable)
 {
     gint i;
     GtkTreeViewColumn   *col;
diff --git a/src/treeview.h b/src/treeview.h
index cb09e369..e0625eab 100644
--- a/src/treeview.h
+++ b/src/treeview.h
@@ -40,9 +40,6 @@ treeview_live_game_show_commentary(const LiveGameUnit *unit);
 void
 treeview_live_game_show_initial_commentary(const LiveGameUnit *unit);
 
-void
-treeview_live_game_show_teams(void);
-
 void
 treeview_live_game_set_up_commentary(void);
 
diff --git a/src/treeview_helper.c b/src/treeview_helper.c
index a6e4a622..4272a81d 100644
--- a/src/treeview_helper.c
+++ b/src/treeview_helper.c
@@ -62,7 +62,6 @@ treeview_helper_get_index(GtkTreeView *treeview, gint column)
     @param column The column we'd like to get the content of.
     @return The pointer in the given column of the selected row.
 */
-/*d*/
 gpointer
 treeview_helper_get_pointer(GtkTreeView *treeview, gint column)
 {
@@ -580,10 +579,10 @@ treeview_helper_get_attributes_from_scout(gint scout)
     @see The GTK reference. */
 void
 treeview_helper_team_selection(GtkTreeViewColumn *col,
-			     GtkCellRenderer   *renderer,
-			     GtkTreeModel      *model,
-			     GtkTreeIter       *iter,
-			     gpointer           user_data)
+			       GtkCellRenderer   *renderer,
+			       GtkTreeModel      *model,
+			       GtkTreeIter       *iter,
+			       gpointer           user_data)
 {
     gchar buf[SMALL];
     gint column = treeview_helper_get_col_number_column(col);
diff --git a/src/user.c b/src/user.c
index 123b0902..bfa184ab 100644
--- a/src/user.c
+++ b/src/user.c
@@ -223,7 +223,7 @@ user_from_team(const Team *tm)
     g_warning("User going with team %s not found.\n",
 	      tm->name->str);
 
-    main_exit_program(EXIT_POINTER_NOT_FOUND, "");
+    main_exit_program(EXIT_POINTER_NOT_FOUND, NULL);
 
     return NULL;
 }
@@ -466,24 +466,6 @@ user_event_show_next(void)
 		    event->value_string->str, ((Team*)event->value_pointer)->name->str);
 	    game_gui_show_warning(buf);
 	    break;
-/* 	case EVENT_TYPE_TRANSFER_OFFER: */
-/* 	    temp_int = transfer_get_index(event->user->tm, event->value1); */
-/* 	    misc_print_grouped_int(transoff(temp_int, 0).fee, buf2, FALSE); */
-/* 	    misc_print_grouped_int(ABS(transoff(temp_int, 0).fee -  */
-/* 				       player_of_id_team(event->user->tm, trans(temp_int).id)->value), buf3, FALSE); */
-/* 	    if(transoff(temp_int, 0).fee -  */
-/* 	       player_of_id_team(event->user->tm, trans(temp_int).id)->value > 0) */
-/* 		strcat(buf3, _(" more")); */
-/* 	    else */
-/* 		strcat(buf3, _(" less")); */
-
-/* 	    sprintf(buf, _("%s would like to buy %s. They offer %s for him, which is %s than the player's value. Do you accept?"), transoff(temp_int, 0).tm->name->str, */
-/* 		    player_of_id_team(event->user->tm, trans(temp_int).id)->name->str, */
-/* 		    buf2, buf3); */
-/* 	    stat1 = STATUS_TRANSFER_OFFER; */
-/* 	    stat2 = temp_int; */
-/* 	    window_show_yesno(buf); */
-/* 	    break; */
 	case EVENT_TYPE_PLAYER_CAREER_STOP:
 	    sprintf(buf, _("%s's injury was so severe that he can't play football on a professional level anymore. He leaves your team."), player_of_id_team(event->user->tm, event->value1)->name->str);
 	    if(event->user->tm->players->len < 12)
diff --git a/src/window.c b/src/window.c
index 29b521b5..25335e80 100644
--- a/src/window.c
+++ b/src/window.c
@@ -329,6 +329,7 @@ window_create(gint window_type)
     {
 	default:
 	    g_warning("window_create: unknown window type %d\n", window_type);
+	    main_exit_program(EXIT_INT_NOT_FOUND, NULL);
 	    break;
 	case WINDOW_MAIN:
 	    if(window.main == NULL)
diff --git a/src/xml_country.c b/src/xml_country.c
index 064ecbee..94d7baa9 100644
--- a/src/xml_country.c
+++ b/src/xml_country.c
@@ -172,7 +172,7 @@ xml_country_read(const gchar *country_name)
     if(!g_file_get_contents(file_name, &file_contents, &length, &error))
     {
 	g_warning("xml_country_read: error reading file %s\n", file_name);
-	misc_print_error(&error, FALSE);
+	misc_print_error(&error, TRUE);
 	return;
     }
 
diff --git a/src/xml_country.h b/src/xml_country.h
index 596f8aa3..de88ca39 100644
--- a/src/xml_country.h
+++ b/src/xml_country.h
@@ -3,9 +3,6 @@
 
 #include "bygfoot.h"
 
-GPtrArray*
-xml_country_get_team_names(const gchar *country_name);
-
 void
 xml_country_read_start_element (GMarkupParseContext *context,
 				const gchar         *element_name,
diff --git a/src/xml_loadsave_league_stat.c b/src/xml_loadsave_league_stat.c
index 6dc900c2..6226162c 100644
--- a/src/xml_loadsave_league_stat.c
+++ b/src/xml_loadsave_league_stat.c
@@ -88,8 +88,12 @@ xml_loadsave_league_stat_end_element    (GMarkupParseContext *context,
 	else if(in_state == TAG_STAT_PLAYER_GOALIES)
 	    stat_array = lstat->player_goalies;
 	else
+	{
 	    g_warning("xml_loadsave_league_stat_end_element: unknown in_state %d \n", 
 		      in_state);
+	    return;
+	}
+
 	g_array_append_val(stat_array, new_stat);
     }
     else if(tag == TAG_STAT_VALUE_STRING ||
diff --git a/src/xml_name.c b/src/xml_name.c
index 56374c74..42a16015 100644
--- a/src/xml_name.c
+++ b/src/xml_name.c
@@ -105,7 +105,7 @@ xml_name_read(const gchar *sid, NameList *namelist)
     if(!g_file_get_contents(file_name, &file_contents, &length, &error))
     {
 	g_warning("xml_name_read: error reading file %s\n", file_name);
-	misc_print_error(&error, FALSE);
+	misc_print_error(&error, TRUE);
 	return;
     }