diff --git a/.gitignore b/.gitignore
index c6e2b06..756e9d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@
 # Jonas added that
 *.depend
 *-bin
+export/*
+.torcs.rc
+src/libs/txml/gennmtab/gennmtab
diff --git a/.torcs.rc b/.torcs.rc
index be1cc8e..01a0487 100644
--- a/.torcs.rc
+++ b/.torcs.rc
@@ -1,2 +1,2 @@
-TORCS_BASE = /home/michaelheinrich/github/torcs-1.3.7
-MAKE_DEFAULT = /home/michaelheinrich/github/torcs-1.3.7/Make-default.mk
+TORCS_BASE = /home/jonas/torcs/torcs-1.3.7
+MAKE_DEFAULT = /home/jonas/torcs/torcs-1.3.7/Make-default.mk
diff --git a/export/include/3D/Basic.h b/export/include/3D/Basic.h
index 63044a9..2153c44 120000
--- a/export/include/3D/Basic.h
+++ b/export/include/3D/Basic.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
\ No newline at end of file
diff --git a/export/include/3D/Matrix.h b/export/include/3D/Matrix.h
index a8bcd09..64b91a2 120000
--- a/export/include/3D/Matrix.h
+++ b/export/include/3D/Matrix.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
\ No newline at end of file
diff --git a/export/include/3D/Point.h b/export/include/3D/Point.h
index 25364e7..d4f29fa 120000
--- a/export/include/3D/Point.h
+++ b/export/include/3D/Point.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
\ No newline at end of file
diff --git a/export/include/3D/Quaternion.h b/export/include/3D/Quaternion.h
index 969a816..628e495 120000
--- a/export/include/3D/Quaternion.h
+++ b/export/include/3D/Quaternion.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
\ No newline at end of file
diff --git a/export/include/3D/Tuple3.h b/export/include/3D/Tuple3.h
index 5995dce..9c05d69 120000
--- a/export/include/3D/Tuple3.h
+++ b/export/include/3D/Tuple3.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
\ No newline at end of file
diff --git a/export/include/3D/Tuple4.h b/export/include/3D/Tuple4.h
index 6e13b15..38aa384 120000
--- a/export/include/3D/Tuple4.h
+++ b/export/include/3D/Tuple4.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
\ No newline at end of file
diff --git a/export/include/3D/Vector.h b/export/include/3D/Vector.h
index 2f92807..80ad389 120000
--- a/export/include/3D/Vector.h
+++ b/export/include/3D/Vector.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
\ No newline at end of file
diff --git a/export/include/SOLID/solid.h b/export/include/SOLID/solid.h
index 3a4a03a..aacc5a2 120000
--- a/export/include/SOLID/solid.h
+++ b/export/include/SOLID/solid.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
\ No newline at end of file
diff --git a/export/include/car.h b/export/include/car.h
index 20c30e9..f8891ef 120000
--- a/export/include/car.h
+++ b/export/include/car.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/car.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/car.h
\ No newline at end of file
diff --git a/export/include/client.h b/export/include/client.h
index afabc38..312a817 120000
--- a/export/include/client.h
+++ b/export/include/client.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/client.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/client/client.h
\ No newline at end of file
diff --git a/export/include/controlconfig.h b/export/include/controlconfig.h
index 1ac9b7b..d2737f5 120000
--- a/export/include/controlconfig.h
+++ b/export/include/controlconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/controlconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/controlconfig.h
\ No newline at end of file
diff --git a/export/include/driverconfig.h b/export/include/driverconfig.h
index ce0bc0e..28bd965 120000
--- a/export/include/driverconfig.h
+++ b/export/include/driverconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/driverconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/driverconfig.h
\ No newline at end of file
diff --git a/export/include/exitmenu.h b/export/include/exitmenu.h
index ab76ecc..965e0cd 120000
--- a/export/include/exitmenu.h
+++ b/export/include/exitmenu.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/exitmenu.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/client/exitmenu.h
\ No newline at end of file
diff --git a/export/include/glfeatures.h b/export/include/glfeatures.h
index 74ba8c3..994d9ee 120000
--- a/export/include/glfeatures.h
+++ b/export/include/glfeatures.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
\ No newline at end of file
diff --git a/export/include/graphconfig.h b/export/include/graphconfig.h
index a21508d..9444dab 120000
--- a/export/include/graphconfig.h
+++ b/export/include/graphconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/graphconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/graphconfig.h
\ No newline at end of file
diff --git a/export/include/graphic.h b/export/include/graphic.h
index 67c57ec..f680c55 120000
--- a/export/include/graphic.h
+++ b/export/include/graphic.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/graphic.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/graphic.h
\ No newline at end of file
diff --git a/export/include/joystickconfig.h b/export/include/joystickconfig.h
index afd4b96..d1ff39f 120000
--- a/export/include/joystickconfig.h
+++ b/export/include/joystickconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
\ No newline at end of file
diff --git a/export/include/learning/ANN.h b/export/include/learning/ANN.h
index 9df5ed5..0e921b9 120000
--- a/export/include/learning/ANN.h
+++ b/export/include/learning/ANN.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ANN.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ANN.h
\ No newline at end of file
diff --git a/export/include/learning/Distribution.h b/export/include/learning/Distribution.h
index ba28557..f6fa892 120000
--- a/export/include/learning/Distribution.h
+++ b/export/include/learning/Distribution.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/Distribution.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/Distribution.h
\ No newline at end of file
diff --git a/export/include/learning/List.h b/export/include/learning/List.h
index 099ba8a..e43354e 120000
--- a/export/include/learning/List.h
+++ b/export/include/learning/List.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/List.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/List.h
\ No newline at end of file
diff --git a/export/include/learning/MathFunctions.h b/export/include/learning/MathFunctions.h
index 3974a05..14de8be 120000
--- a/export/include/learning/MathFunctions.h
+++ b/export/include/learning/MathFunctions.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/MathFunctions.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/MathFunctions.h
\ No newline at end of file
diff --git a/export/include/learning/ann_policy.h b/export/include/learning/ann_policy.h
index 7bdd2c2..1d6c1e2 120000
--- a/export/include/learning/ann_policy.h
+++ b/export/include/learning/ann_policy.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ann_policy.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ann_policy.h
\ No newline at end of file
diff --git a/export/include/learning/learn_debug.h b/export/include/learning/learn_debug.h
index 4d15f55..7759500 120000
--- a/export/include/learning/learn_debug.h
+++ b/export/include/learning/learn_debug.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/learn_debug.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/learn_debug.h
\ No newline at end of file
diff --git a/export/include/learning/policy.h b/export/include/learning/policy.h
index 2ed7972..c7faf32 120000
--- a/export/include/learning/policy.h
+++ b/export/include/learning/policy.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/policy.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/policy.h
\ No newline at end of file
diff --git a/export/include/learning/real.h b/export/include/learning/real.h
index 6a2579d..320866a 120000
--- a/export/include/learning/real.h
+++ b/export/include/learning/real.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/real.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/real.h
\ No newline at end of file
diff --git a/export/include/learning/string_utils.h b/export/include/learning/string_utils.h
index a935644..e473e25 120000
--- a/export/include/learning/string_utils.h
+++ b/export/include/learning/string_utils.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/string_utils.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/string_utils.h
\ No newline at end of file
diff --git a/export/include/mouseconfig.h b/export/include/mouseconfig.h
index 54bf478..e640054 120000
--- a/export/include/mouseconfig.h
+++ b/export/include/mouseconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
\ No newline at end of file
diff --git a/export/include/musicplayer/OggSoundStream.h b/export/include/musicplayer/OggSoundStream.h
index 4f05b5e..8a295e5 120000
--- a/export/include/musicplayer/OggSoundStream.h
+++ b/export/include/musicplayer/OggSoundStream.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
\ No newline at end of file
diff --git a/export/include/musicplayer/OpenALMusicPlayer.h b/export/include/musicplayer/OpenALMusicPlayer.h
index 1c4aad1..09e0a73 120000
--- a/export/include/musicplayer/OpenALMusicPlayer.h
+++ b/export/include/musicplayer/OpenALMusicPlayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
\ No newline at end of file
diff --git a/export/include/musicplayer/SoundStream.h b/export/include/musicplayer/SoundStream.h
index f379c31..6e08495 120000
--- a/export/include/musicplayer/SoundStream.h
+++ b/export/include/musicplayer/SoundStream.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
\ No newline at end of file
diff --git a/export/include/musicplayer/musicplayer.h b/export/include/musicplayer/musicplayer.h
index 97e323d..304a6ce 120000
--- a/export/include/musicplayer/musicplayer.h
+++ b/export/include/musicplayer/musicplayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
\ No newline at end of file
diff --git a/export/include/openglconfig.h b/export/include/openglconfig.h
index 91471cd..2edf3af 120000
--- a/export/include/openglconfig.h
+++ b/export/include/openglconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/openglconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/openglconfig.h
\ No newline at end of file
diff --git a/export/include/os.h b/export/include/os.h
index 22b9ef5..d508d20 120000
--- a/export/include/os.h
+++ b/export/include/os.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/os.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/os.h
\ No newline at end of file
diff --git a/export/include/osspec.h b/export/include/osspec.h
index 19ab927..7aab049 120000
--- a/export/include/osspec.h
+++ b/export/include/osspec.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/linux/osspec.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/linux/osspec.h
\ No newline at end of file
diff --git a/export/include/playerpref.h b/export/include/playerpref.h
index ac4d772..61d1228 120000
--- a/export/include/playerpref.h
+++ b/export/include/playerpref.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/playerpref.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/playerpref.h
\ No newline at end of file
diff --git a/export/include/portability.h b/export/include/portability.h
index 1eb198d..34ec563 120000
--- a/export/include/portability.h
+++ b/export/include/portability.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/portability/portability.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/portability/portability.h
\ No newline at end of file
diff --git a/export/include/raceinit.h b/export/include/raceinit.h
index a4b86c4..87ab0c3 120000
--- a/export/include/raceinit.h
+++ b/export/include/raceinit.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
\ No newline at end of file
diff --git a/export/include/raceman.h b/export/include/raceman.h
index 563ccfc..2b3a1ce 120000
--- a/export/include/raceman.h
+++ b/export/include/raceman.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/raceman.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/raceman.h
\ No newline at end of file
diff --git a/export/include/racescreens.h b/export/include/racescreens.h
index 35c0c46..9277f5c 120000
--- a/export/include/racescreens.h
+++ b/export/include/racescreens.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/racescreens/racescreens.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/racescreens/racescreens.h
\ No newline at end of file
diff --git a/export/include/replay.h b/export/include/replay.h
index 4fc7489..b5c13c4 120000
--- a/export/include/replay.h
+++ b/export/include/replay.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/replay.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/replay.h
\ No newline at end of file
diff --git a/export/include/robot.h b/export/include/robot.h
index 5a6c95c..daf0cef 120000
--- a/export/include/robot.h
+++ b/export/include/robot.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/robot.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/robot.h
\ No newline at end of file
diff --git a/export/include/robottools.h b/export/include/robottools.h
index 2812e2b..7c13b58 120000
--- a/export/include/robottools.h
+++ b/export/include/robottools.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/robottools/robottools.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/robottools/robottools.h
\ No newline at end of file
diff --git a/export/include/screen_properties.h b/export/include/screen_properties.h
index 4f48442..f61cbae 120000
--- a/export/include/screen_properties.h
+++ b/export/include/screen_properties.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
\ No newline at end of file
diff --git a/export/include/simu.h b/export/include/simu.h
index 48fe631..7bda180 120000
--- a/export/include/simu.h
+++ b/export/include/simu.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/simu.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/simu.h
\ No newline at end of file
diff --git a/export/include/simuconfig.h b/export/include/simuconfig.h
index c8a7a1f..f732a99 120000
--- a/export/include/simuconfig.h
+++ b/export/include/simuconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/simuconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/simuconfig.h
\ No newline at end of file
diff --git a/export/include/singleplayer.h b/export/include/singleplayer.h
index ddae6f7..d9eeb19 120000
--- a/export/include/singleplayer.h
+++ b/export/include/singleplayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
\ No newline at end of file
diff --git a/export/include/soundconfig.h b/export/include/soundconfig.h
index 67116ff..6ed8207 120000
--- a/export/include/soundconfig.h
+++ b/export/include/soundconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/soundconfig.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/soundconfig.h
\ No newline at end of file
diff --git a/export/include/telemetry.h b/export/include/telemetry.h
index 1ace446..4fea489 120000
--- a/export/include/telemetry.h
+++ b/export/include/telemetry.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/telemetry.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/telemetry.h
\ No newline at end of file
diff --git a/export/include/tgf.h b/export/include/tgf.h
index 116acf7..e3723e8 120000
--- a/export/include/tgf.h
+++ b/export/include/tgf.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/tgf.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/tgf.h
\ No newline at end of file
diff --git a/export/include/tgfclient.h b/export/include/tgfclient.h
index 6452938..b28088c 120000
--- a/export/include/tgfclient.h
+++ b/export/include/tgfclient.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
\ No newline at end of file
diff --git a/export/include/tmath/linalg_t.h b/export/include/tmath/linalg_t.h
index 5b6b864..db1be04 120000
--- a/export/include/tmath/linalg_t.h
+++ b/export/include/tmath/linalg_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/linalg_t.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/linalg_t.h
\ No newline at end of file
diff --git a/export/include/tmath/straight2_t.h b/export/include/tmath/straight2_t.h
index dbe15a2..f3bfd13 120000
--- a/export/include/tmath/straight2_t.h
+++ b/export/include/tmath/straight2_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/straight2_t.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/straight2_t.h
\ No newline at end of file
diff --git a/export/include/tmath/v2_t.h b/export/include/tmath/v2_t.h
index 770dc6b..4ac6dd0 120000
--- a/export/include/tmath/v2_t.h
+++ b/export/include/tmath/v2_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v2_t.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v2_t.h
\ No newline at end of file
diff --git a/export/include/tmath/v3_t.h b/export/include/tmath/v3_t.h
index 7900862..db2651b 120000
--- a/export/include/tmath/v3_t.h
+++ b/export/include/tmath/v3_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v3_t.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v3_t.h
\ No newline at end of file
diff --git a/export/include/tmath/v4_t.h b/export/include/tmath/v4_t.h
index 16f737a..c0864f8 120000
--- a/export/include/tmath/v4_t.h
+++ b/export/include/tmath/v4_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v4_t.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v4_t.h
\ No newline at end of file
diff --git a/export/include/track.h b/export/include/track.h
index 85ff351..5ba2277 120000
--- a/export/include/track.h
+++ b/export/include/track.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/track.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/track.h
\ No newline at end of file
diff --git a/export/include/xml.h b/export/include/xml.h
index f70358b..23e2d80 120000
--- a/export/include/xml.h
+++ b/export/include/xml.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xml.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xml.h
\ No newline at end of file
diff --git a/export/include/xmlparse.h b/export/include/xmlparse.h
index 056da38..2048a06 120000
--- a/export/include/xmlparse.h
+++ b/export/include/xmlparse.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xmlparse.h
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xmlparse.h
\ No newline at end of file
diff --git a/export/lib/libsolid.a b/export/lib/libsolid.a
index d1e51df..3400a04 120000
--- a/export/lib/libsolid.a
+++ b/export/lib/libsolid.a
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
\ No newline at end of file
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
\ No newline at end of file
diff --git a/src/drivers/pid_driver/driver.cpp b/src/drivers/pid_driver/driver.cpp
index f1767bc..abc96cf 100644
--- a/src/drivers/pid_driver/driver.cpp
+++ b/src/drivers/pid_driver/driver.cpp
@@ -65,8 +65,9 @@ void Driver::drive(tCarElt *car, tSituation *s) {
         // std::cout << "SpeedY " << i << ": " << getSpeed() << std::endl;
         // std::cout << "SpeedDiffX " << i << ": " << getOpponentSpeedDiffX(opponent[i]) << std::endl;
         // std::cout << "SpeedDiffY " << i << ": " << getOpponentSpeedDiffY(opponent[i]) << std::endl;
-        std::cout << "DistanceY " << i << ": " << getOpponentDistanceY(opponent[i]) << std::endl;
-        std::cout << "DistanceX " << i << ": " << getOpponentDistanceX(opponent[i]) << std::endl;
+        // std::cout << "DistanceY " << i << ": " << getOpponentDistanceY(opponent[i]) << std::endl;
+        // std::cout << "DistanceX " << i << ": " << getOpponentDistanceX(opponent[i]) << std::endl;
+        std::cout << getOpponentDistanceX(opponent[i]) << ", " << getOpponentDistanceY(opponent[i]) << std::endl;
     }
 
     // std::cout << "AI car ----" << std::endl;
diff --git a/src/libs/txml/gennmtab/gennmtab b/src/libs/txml/gennmtab/gennmtab
index 3bbd136..43ca511 100755
Binary files a/src/libs/txml/gennmtab/gennmtab and b/src/libs/txml/gennmtab/gennmtab differ