206 files changed, 38 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 3f6193d..48130fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 tarball: clean
-	which zip && zip -r advtrains.zip advtrains
+	which zip && zip -r advtrains.zip . -x "assets*" -x "*.zip" -x "*.git*"
 clean:
 	rm -f advtrains.zip
diff --git a/advtrains.zip b/advtrains.zip
index 6383590..01f9e4a 100644
--- a/advtrains.zip
+++ b/advtrains.zip
diff --git a/advtrains/advtrains.zip b/advtrains/advtrains.zip
deleted file mode 100644
index a3dab82..0000000
--- a/advtrains/advtrains.zip
+++ /dev/null
diff --git a/advtrains/advtrains/textures/advtrains_couple.png b/advtrains/advtrains/textures/advtrains_couple.png
deleted file mode 100644
index 9e997e4..0000000
--- a/advtrains/advtrains/textures/advtrains_couple.png
+++ /dev/null
diff --git a/advtrains/advtrains/textures/advtrains_discouple.png b/advtrains/advtrains/textures/advtrains_discouple.png
deleted file mode 100644
index b27c4fb..0000000
--- a/advtrains/advtrains/textures/advtrains_discouple.png
+++ /dev/null
diff --git a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
deleted file mode 100644
index bb057f8..0000000
--- a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
+++ /dev/null
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png
deleted file mode 100644
index c850518..0000000
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png
+++ /dev/null
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png
deleted file mode 100644
index 8bfbe06..0000000
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box.png
+++ /dev/null
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png
deleted file mode 100644
index 0b72ac3..0000000
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_inv.png
+++ /dev/null
diff --git a/advtrains/advtrains/api_doc.txt b/advtrains/api_doc.txt
index 20f285f..20f285f 100644
--- a/advtrains/advtrains/api_doc.txt
+++ b/advtrains/api_doc.txt
diff --git a/advtrains/advtrains/atc.lua b/advtrains/atc.lua
index 5f1f64d..5f1f64d 100644
--- a/advtrains/advtrains/atc.lua
+++ b/advtrains/atc.lua
diff --git a/advtrains/advtrains/couple.lua b/advtrains/couple.lua
index 7bab241..7bab241 100644
--- a/advtrains/advtrains/couple.lua
+++ b/advtrains/couple.lua
diff --git a/advtrains/advtrains/craft_items.lua b/advtrains/craft_items.lua
index a4db385..a4db385 100644
--- a/advtrains/advtrains/craft_items.lua
+++ b/advtrains/craft_items.lua
diff --git a/advtrains/advtrains/crafting.lua b/advtrains/crafting.lua
index 72cd6da..72cd6da 100644
--- a/advtrains/advtrains/crafting.lua
+++ b/advtrains/crafting.lua
diff --git a/advtrains/advtrains/debugitems.lua b/advtrains/debugitems.lua
index dcc95d9..dcc95d9 100644
--- a/advtrains/advtrains/debugitems.lua
+++ b/advtrains/debugitems.lua
diff --git a/advtrains/advtrains/debugringbuffer.lua b/advtrains/debugringbuffer.lua
index 704c0c5..704c0c5 100644
--- a/advtrains/advtrains/debugringbuffer.lua
+++ b/advtrains/debugringbuffer.lua
diff --git a/advtrains/advtrains/depends.txt b/advtrains/depends.txt
index 1815e54..1815e54 100644
--- a/advtrains/advtrains/depends.txt
+++ b/advtrains/depends.txt
diff --git a/advtrains/advtrains/description.txt b/advtrains/description.txt
index ecc5d58..bb13b97 100644
--- a/advtrains/advtrains/description.txt
+++ b/advtrains/description.txt
@@ -1,8 +1,8 @@
-Advanced Trains v1.3.0, by orwell and contributors. Also see readme.
+Advanced Trains v1.3.8, by orwell and contributors. Also see readme.
 Good-looking, realistic trains for minetest.
 
 For crafting recipes, see manual.pdf
 
 Website: http://advtrains.bleipb.de/
 Manual:  https://github.com/orwell96/advtrains/blob/master/manual.pdf
-Forum :  https://forum.minetest.net/viewtopic.php?f=11&t=14726
\ No newline at end of file
+Forum :  https://forum.minetest.net/viewtopic.php?f=11&t=14726
diff --git a/advtrains/advtrains/digtron.lua b/advtrains/digtron.lua
index 7105a54..7105a54 100644
--- a/advtrains/advtrains/digtron.lua
+++ b/advtrains/digtron.lua
diff --git a/advtrains/advtrains/helpers.lua b/advtrains/helpers.lua
index 91c0c1c..91c0c1c 100644
--- a/advtrains/advtrains/helpers.lua
+++ b/advtrains/helpers.lua
diff --git a/advtrains/advtrains/init.lua b/advtrains/init.lua
index 74990e7..6255780 100644
--- a/advtrains/advtrains/init.lua
+++ b/advtrains/init.lua
@@ -37,7 +37,9 @@ function advtrains.pcall(fun)
 				advtrains.dumppath(train.path)
 				atwarn("Dumping last debug outputs: ", err)
 				atprint("Train state: index",train.index,"end_index", train.end_index,"| max_iot", train.max_index_on_track, "min_iot", train.min_index_on_track, "<> pe_min", train.path_extent_min,"pe_max", train.path_extent_max)
-				advtrains.drb_dump(advtrains.atprint_context_tid)
+				if minetest.settings:get_bool("advtrains_enable_debugging") then
+					advtrains.drb_dump(advtrains.atprint_context_tid)
+				end
 			end
 			atwarn("Lua Error occured: ", err)
 			atwarn(debug.traceback())
@@ -382,5 +384,19 @@ minetest.register_chatcommand("at_empty_seats",
 				reload_saves()
 			end)
         end,
-        privs = {train_operator=true}, -- Require the "privs" privilege to run
-    })
+})
+-- This chat command solves another problem: Trains getting randomly stuck.
+minetest.register_chatcommand("at_reroute",
+	{
+        params = "", 
+        description = "Delete all train routes, force them to recalculate", 
+        privs = {train_operator=true}, -- Only train operator is required, since this is relatively safe.
+        func = function(name, param)
+			return advtrains.pcall(function()
+				atwarn("Train routes will be recalculated now")
+				advtrains.save(false)
+				reload_saves()
+			end)
+        end,
+})
+
diff --git a/advtrains/advtrains/loading.lua b/advtrains/loading.lua
index 8ac7b00..8ac7b00 100644
--- a/advtrains/advtrains/loading.lua
+++ b/advtrains/loading.lua
diff --git a/advtrains/advtrains/locale/de.txt b/advtrains/locale/de.txt
index fe770d8..fe770d8 100644
--- a/advtrains/advtrains/locale/de.txt
+++ b/advtrains/locale/de.txt
diff --git a/advtrains/advtrains/misc_nodes.lua b/advtrains/misc_nodes.lua
index 37f535d..37f535d 100644
--- a/advtrains/advtrains/misc_nodes.lua
+++ b/advtrains/misc_nodes.lua
diff --git a/advtrains/advtrains/models/advtrains_across.obj b/advtrains/models/advtrains_across.obj
index 4ebf393..4ebf393 100644
--- a/advtrains/advtrains/models/advtrains_across.obj
+++ b/advtrains/models/advtrains_across.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_bumper_st.b3d b/advtrains/models/advtrains_dtrack_bumper_st.b3d
index a6d9745..a6d9745 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_bumper_st.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_30.b3d b/advtrains/models/advtrains_dtrack_bumper_st_30.b3d
index 5f5b3f4..5f5b3f4 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_30.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_45.b3d b/advtrains/models/advtrains_dtrack_bumper_st_45.b3d
index f13ae75..f13ae75 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_45.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_60.b3d b/advtrains/models/advtrains_dtrack_bumper_st_60.b3d
index 59a2285..59a2285 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_bumper_st_60.b3d
+++ b/advtrains/models/advtrains_dtrack_bumper_st_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_cr.b3d b/advtrains/models/advtrains_dtrack_cr.b3d
index c708292..c708292 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_cr.b3d
+++ b/advtrains/models/advtrains_dtrack_cr.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_cr_30.b3d b/advtrains/models/advtrains_dtrack_cr_30.b3d
index 7ca0bda..7ca0bda 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_cr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_cr_45.b3d b/advtrains/models/advtrains_dtrack_cr_45.b3d
index b22ea0d..b22ea0d 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_cr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_cr_60.b3d b/advtrains/models/advtrains_dtrack_cr_60.b3d
index e9b16d6..e9b16d6 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_cr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_cr_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_st.b3d b/advtrains/models/advtrains_dtrack_st.b3d
index c240416..c240416 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_st.b3d
+++ b/advtrains/models/advtrains_dtrack_st.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_st_30.b3d b/advtrains/models/advtrains_dtrack_st_30.b3d
index fd77e66..fd77e66 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_st_30.b3d
+++ b/advtrains/models/advtrains_dtrack_st_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_st_45.b3d b/advtrains/models/advtrains_dtrack_st_45.b3d
index af3afb1..af3afb1 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_st_45.b3d
+++ b/advtrains/models/advtrains_dtrack_st_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_st_60.b3d b/advtrains/models/advtrains_dtrack_st_60.b3d
index 6cb19e6..6cb19e6 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_st_60.b3d
+++ b/advtrains/models/advtrains_dtrack_st_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlcr.b3d b/advtrains/models/advtrains_dtrack_swlcr.b3d
index 8b1ac0e..8b1ac0e 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlcr.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlcr_30.b3d b/advtrains/models/advtrains_dtrack_swlcr_30.b3d
index 6def7ab..6def7ab 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlcr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlcr_45.b3d b/advtrains/models/advtrains_dtrack_swlcr_45.b3d
index cc874ca..cc874ca 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlcr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlcr_60.b3d b/advtrains/models/advtrains_dtrack_swlcr_60.b3d
index 1472a00..1472a00 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlcr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swlcr_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlst.b3d b/advtrains/models/advtrains_dtrack_swlst.b3d
index ecdb326..ecdb326 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlst.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlst_30.b3d b/advtrains/models/advtrains_dtrack_swlst_30.b3d
index fd6e91d..fd6e91d 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlst_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlst_45.b3d b/advtrains/models/advtrains_dtrack_swlst_45.b3d
index dae694e..dae694e 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlst_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swlst_60.b3d b/advtrains/models/advtrains_dtrack_swlst_60.b3d
index 8f2b0e2..8f2b0e2 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swlst_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swlst_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrcr.b3d b/advtrains/models/advtrains_dtrack_swrcr.b3d
index 4610826..4610826 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrcr.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrcr_30.b3d b/advtrains/models/advtrains_dtrack_swrcr_30.b3d
index 71b87f3..71b87f3 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrcr_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrcr_45.b3d b/advtrains/models/advtrains_dtrack_swrcr_45.b3d
index 5457972..5457972 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrcr_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrcr_60.b3d b/advtrains/models/advtrains_dtrack_swrcr_60.b3d
index 167a3ff..167a3ff 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrcr_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swrcr_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrst.b3d b/advtrains/models/advtrains_dtrack_swrst.b3d
index 69b6996..69b6996 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrst.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrst_30.b3d b/advtrains/models/advtrains_dtrack_swrst_30.b3d
index 19ee483..19ee483 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrst_30.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrst_45.b3d b/advtrains/models/advtrains_dtrack_swrst_45.b3d
index 70d051f..70d051f 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrst_45.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_swrst_60.b3d b/advtrains/models/advtrains_dtrack_swrst_60.b3d
index 69a58fb..69a58fb 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_swrst_60.b3d
+++ b/advtrains/models/advtrains_dtrack_swrst_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst1.obj b/advtrains/models/advtrains_dtrack_vst1.obj
index 33d9bf3..33d9bf3 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst1.obj
+++ b/advtrains/models/advtrains_dtrack_vst1.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst1_45.obj b/advtrains/models/advtrains_dtrack_vst1_45.obj
index 8ff8343..8ff8343 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst1_45.obj
+++ b/advtrains/models/advtrains_dtrack_vst1_45.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst2.obj b/advtrains/models/advtrains_dtrack_vst2.obj
index 444ce42..444ce42 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst2.obj
+++ b/advtrains/models/advtrains_dtrack_vst2.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst2_45.obj b/advtrains/models/advtrains_dtrack_vst2_45.obj
index 5dc708b..5dc708b 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst2_45.obj
+++ b/advtrains/models/advtrains_dtrack_vst2_45.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst31.obj b/advtrains/models/advtrains_dtrack_vst31.obj
index c4cb84f..c4cb84f 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst31.obj
+++ b/advtrains/models/advtrains_dtrack_vst31.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst32.obj b/advtrains/models/advtrains_dtrack_vst32.obj
index 297d46b..297d46b 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst32.obj
+++ b/advtrains/models/advtrains_dtrack_vst32.obj
diff --git a/advtrains/advtrains/models/advtrains_dtrack_vst33.obj b/advtrains/models/advtrains_dtrack_vst33.obj
index 8cb5f04..8cb5f04 100644
--- a/advtrains/advtrains/models/advtrains_dtrack_vst33.obj
+++ b/advtrains/models/advtrains_dtrack_vst33.obj
diff --git a/advtrains/advtrains/models/advtrains_modernwagon.b3d b/advtrains/models/advtrains_modernwagon.b3d
index aacddca..aacddca 100644
--- a/advtrains/advtrains/models/advtrains_modernwagon.b3d
+++ b/advtrains/models/advtrains_modernwagon.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_off.b3d b/advtrains/models/advtrains_retrosignal_off.b3d
index 3d231dd..3d231dd 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_off.b3d
+++ b/advtrains/models/advtrains_retrosignal_off.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_off_30.b3d b/advtrains/models/advtrains_retrosignal_off_30.b3d
index da258e1..da258e1 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_off_30.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_off_45.b3d b/advtrains/models/advtrains_retrosignal_off_45.b3d
index 338224a..338224a 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_off_45.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_off_60.b3d b/advtrains/models/advtrains_retrosignal_off_60.b3d
index c560ca1..c560ca1 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_off_60.b3d
+++ b/advtrains/models/advtrains_retrosignal_off_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_on.b3d b/advtrains/models/advtrains_retrosignal_on.b3d
index 3d19439..3d19439 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_on.b3d
+++ b/advtrains/models/advtrains_retrosignal_on.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_on_30.b3d b/advtrains/models/advtrains_retrosignal_on_30.b3d
index 98f8a92..98f8a92 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_on_30.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_on_45.b3d b/advtrains/models/advtrains_retrosignal_on_45.b3d
index 414e121..414e121 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_on_45.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_retrosignal_on_60.b3d b/advtrains/models/advtrains_retrosignal_on_60.b3d
index a51529a..a51529a 100644
--- a/advtrains/advtrains/models/advtrains_retrosignal_on_60.b3d
+++ b/advtrains/models/advtrains_retrosignal_on_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal.b3d b/advtrains/models/advtrains_signal.b3d
index 7f69560..7f69560 100644
--- a/advtrains/advtrains/models/advtrains_signal.b3d
+++ b/advtrains/models/advtrains_signal.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_30.b3d b/advtrains/models/advtrains_signal_30.b3d
index 0b949a7..0b949a7 100644
--- a/advtrains/advtrains/models/advtrains_signal_30.b3d
+++ b/advtrains/models/advtrains_signal_30.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_45.b3d b/advtrains/models/advtrains_signal_45.b3d
index ccaebf4..ccaebf4 100644
--- a/advtrains/advtrains/models/advtrains_signal_45.b3d
+++ b/advtrains/models/advtrains_signal_45.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_60.b3d b/advtrains/models/advtrains_signal_60.b3d
index cf41e6d..cf41e6d 100644
--- a/advtrains/advtrains/models/advtrains_signal_60.b3d
+++ b/advtrains/models/advtrains_signal_60.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_wall_l.b3d b/advtrains/models/advtrains_signal_wall_l.b3d
index b1bcbcf..b1bcbcf 100644
--- a/advtrains/advtrains/models/advtrains_signal_wall_l.b3d
+++ b/advtrains/models/advtrains_signal_wall_l.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_wall_r.b3d b/advtrains/models/advtrains_signal_wall_r.b3d
index cf26389..cf26389 100644
--- a/advtrains/advtrains/models/advtrains_signal_wall_r.b3d
+++ b/advtrains/models/advtrains_signal_wall_r.b3d
diff --git a/advtrains/advtrains/models/advtrains_signal_wall_t.b3d b/advtrains/models/advtrains_signal_wall_t.b3d
index 30e77f6..30e77f6 100644
--- a/advtrains/advtrains/models/advtrains_signal_wall_t.b3d
+++ b/advtrains/models/advtrains_signal_wall_t.b3d
diff --git a/advtrains/advtrains/models/advtrains_track_cr.b3d b/advtrains/models/advtrains_track_cr.b3d
index b0f5e4b..b0f5e4b 100644
--- a/advtrains/advtrains/models/advtrains_track_cr.b3d
+++ b/advtrains/models/advtrains_track_cr.b3d
diff --git a/advtrains/advtrains/models/advtrains_track_st.b3d b/advtrains/models/advtrains_track_st.b3d
index 10b5d90..10b5d90 100644
--- a/advtrains/advtrains/models/advtrains_track_st.b3d
+++ b/advtrains/models/advtrains_track_st.b3d
diff --git a/advtrains/advtrains/models/advtrains_track_st_45.b3d b/advtrains/models/advtrains_track_st_45.b3d
index 32505a1..32505a1 100644
--- a/advtrains/advtrains/models/advtrains_track_st_45.b3d
+++ b/advtrains/models/advtrains_track_st_45.b3d
diff --git a/advtrains/advtrains/models/trackplane.b3d b/advtrains/models/trackplane.b3d
index b4728c3..b4728c3 100644
--- a/advtrains/advtrains/models/trackplane.b3d
+++ b/advtrains/models/trackplane.b3d
diff --git a/advtrains/modpack.txt b/advtrains/modpack.txt
deleted file mode 100644
index e69de29..0000000
--- a/advtrains/modpack.txt
+++ /dev/null
diff --git a/advtrains/advtrains/nodedb.lua b/advtrains/nodedb.lua
index 862fd53..862fd53 100644
--- a/advtrains/advtrains/nodedb.lua
+++ b/advtrains/nodedb.lua
diff --git a/advtrains/screenshot.png b/advtrains/screenshot.png
deleted file mode 100644
index 78783e1..0000000
--- a/advtrains/screenshot.png
+++ /dev/null
diff --git a/advtrains/advtrains/settingtypes.txt b/advtrains/settingtypes.txt
index 60f8477..60f8477 100644
--- a/advtrains/advtrains/settingtypes.txt
+++ b/advtrains/settingtypes.txt
diff --git a/advtrains/advtrains/signals.lua b/advtrains/signals.lua
index 5c6e484..5c6e484 100644
--- a/advtrains/advtrains/signals.lua
+++ b/advtrains/signals.lua
diff --git a/advtrains/advtrains/textures/advtrains_across.png b/advtrains/textures/advtrains_across.png
index da65a61..da65a61 100644..100755
--- a/advtrains/advtrains/textures/advtrains_across.png
+++ b/advtrains/textures/advtrains_across.png
diff --git a/advtrains/advtrains/textures/advtrains_across_anim.png b/advtrains/textures/advtrains_across_anim.png
index 584d023..584d023 100644..100755
--- a/advtrains/advtrains/textures/advtrains_across_anim.png
+++ b/advtrains/textures/advtrains_across_anim.png
diff --git a/advtrains/advtrains/textures/advtrains_boiler.png b/advtrains/textures/advtrains_boiler.png
index 8c7ff0d..8c7ff0d 100644..100755
--- a/advtrains/advtrains/textures/advtrains_boiler.png
+++ b/advtrains/textures/advtrains_boiler.png
diff --git a/advtrains/advtrains/textures/advtrains_chimney.png b/advtrains/textures/advtrains_chimney.png
index 285a1a6..285a1a6 100644..100755
--- a/advtrains/advtrains/textures/advtrains_chimney.png
+++ b/advtrains/textures/advtrains_chimney.png
diff --git a/advtrains/textures/advtrains_couple.png b/advtrains/textures/advtrains_couple.png
new file mode 100755
index 0000000..eda3704
--- /dev/null
+++ b/advtrains/textures/advtrains_couple.png
diff --git a/advtrains/textures/advtrains_discouple.png b/advtrains/textures/advtrains_discouple.png
new file mode 100755
index 0000000..5c064c3
--- /dev/null
+++ b/advtrains/textures/advtrains_discouple.png
diff --git a/advtrains/advtrains/textures/advtrains_driver_cab.png b/advtrains/textures/advtrains_driver_cab.png
index 331bcc9..331bcc9 100644..100755
--- a/advtrains/advtrains/textures/advtrains_driver_cab.png
+++ b/advtrains/textures/advtrains_driver_cab.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_atc_placer.png b/advtrains/textures/advtrains_dtrack_atc_placer.png
index 31c2b30..31c2b30 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_atc_placer.png
+++ b/advtrains/textures/advtrains_dtrack_atc_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_bumper_placer.png b/advtrains/textures/advtrains_dtrack_bumper_placer.png
index 27191fe..27191fe 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_bumper_placer.png
+++ b/advtrains/textures/advtrains_dtrack_bumper_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_detector_placer.png b/advtrains/textures/advtrains_dtrack_detector_placer.png
index e6c6ad6..e6c6ad6 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_detector_placer.png
+++ b/advtrains/textures/advtrains_dtrack_detector_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_load_placer.png b/advtrains/textures/advtrains_dtrack_load_placer.png
index 427c011..427c011 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_load_placer.png
+++ b/advtrains/textures/advtrains_dtrack_load_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_placer.png b/advtrains/textures/advtrains_dtrack_placer.png
index 7bef8a9..7bef8a9 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_placer.png
+++ b/advtrains/textures/advtrains_dtrack_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_rail.png b/advtrains/textures/advtrains_dtrack_rail.png
index bd0c217..bd0c217 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_rail.png
+++ b/advtrains/textures/advtrains_dtrack_rail.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared.png b/advtrains/textures/advtrains_dtrack_shared.png
index 736c7db..736c7db 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared.png
+++ b/advtrains/textures/advtrains_dtrack_shared.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared_atc.png b/advtrains/textures/advtrains_dtrack_shared_atc.png
index 1f83c37..1f83c37 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared_atc.png
+++ b/advtrains/textures/advtrains_dtrack_shared_atc.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared_detector_off.png b/advtrains/textures/advtrains_dtrack_shared_detector_off.png
index 724d907..724d907 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared_detector_off.png
+++ b/advtrains/textures/advtrains_dtrack_shared_detector_off.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared_detector_on.png b/advtrains/textures/advtrains_dtrack_shared_detector_on.png
index 7bb29d6..7bb29d6 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared_detector_on.png
+++ b/advtrains/textures/advtrains_dtrack_shared_detector_on.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared_load.png b/advtrains/textures/advtrains_dtrack_shared_load.png
index 5fd0d7a..5fd0d7a 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared_load.png
+++ b/advtrains/textures/advtrains_dtrack_shared_load.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_shared_unload.png b/advtrains/textures/advtrains_dtrack_shared_unload.png
index e9fc5bd..e9fc5bd 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_shared_unload.png
+++ b/advtrains/textures/advtrains_dtrack_shared_unload.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_slopeplacer.png b/advtrains/textures/advtrains_dtrack_slopeplacer.png
index 1d456b0..1d456b0 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_slopeplacer.png
+++ b/advtrains/textures/advtrains_dtrack_slopeplacer.png
diff --git a/advtrains/advtrains/textures/advtrains_dtrack_unload_placer.png b/advtrains/textures/advtrains_dtrack_unload_placer.png
index 486861e..486861e 100644..100755
--- a/advtrains/advtrains/textures/advtrains_dtrack_unload_placer.png
+++ b/advtrains/textures/advtrains_dtrack_unload_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_platform.png b/advtrains/textures/advtrains_platform.png
index 5ba9663..5ba9663 100644..100755
--- a/advtrains/advtrains/textures/advtrains_platform.png
+++ b/advtrains/textures/advtrains_platform.png
diff --git a/advtrains/advtrains/textures/advtrains_retrosignal.png b/advtrains/textures/advtrains_retrosignal.png
index 141198d..141198d 100644..100755
--- a/advtrains/advtrains/textures/advtrains_retrosignal.png
+++ b/advtrains/textures/advtrains_retrosignal.png
diff --git a/advtrains/advtrains/textures/advtrains_retrosignal_inv.png b/advtrains/textures/advtrains_retrosignal_inv.png
index 1036594..1036594 100644..100755
--- a/advtrains/advtrains/textures/advtrains_retrosignal_inv.png
+++ b/advtrains/textures/advtrains_retrosignal_inv.png
diff --git a/advtrains/advtrains/textures/advtrains_signal_inv.png b/advtrains/textures/advtrains_signal_inv.png
index ed64ed9..ed64ed9 100644..100755
--- a/advtrains/advtrains/textures/advtrains_signal_inv.png
+++ b/advtrains/textures/advtrains_signal_inv.png
diff --git a/advtrains/advtrains/textures/advtrains_signal_off.png b/advtrains/textures/advtrains_signal_off.png
index 8046e52..8046e52 100644..100755
--- a/advtrains/advtrains/textures/advtrains_signal_off.png
+++ b/advtrains/textures/advtrains_signal_off.png
diff --git a/advtrains/advtrains/textures/advtrains_signal_on.png b/advtrains/textures/advtrains_signal_on.png
index 5228bb3..5228bb3 100644..100755
--- a/advtrains/advtrains/textures/advtrains_signal_on.png
+++ b/advtrains/textures/advtrains_signal_on.png
diff --git a/advtrains/advtrains/textures/advtrains_signal_wall_off.png b/advtrains/textures/advtrains_signal_wall_off.png
index 3e7b1e1..3e7b1e1 100644..100755
--- a/advtrains/advtrains/textures/advtrains_signal_wall_off.png
+++ b/advtrains/textures/advtrains_signal_wall_off.png
diff --git a/advtrains/advtrains/textures/advtrains_signal_wall_on.png b/advtrains/textures/advtrains_signal_wall_on.png
index b628c7e..b628c7e 100644..100755
--- a/advtrains/advtrains/textures/advtrains_signal_wall_on.png
+++ b/advtrains/textures/advtrains_signal_wall_on.png
diff --git a/advtrains/advtrains/textures/advtrains_track_cr.png b/advtrains/textures/advtrains_track_cr.png
index 40f0cc5..40f0cc5 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_cr.png
+++ b/advtrains/textures/advtrains_track_cr.png
diff --git a/advtrains/advtrains/textures/advtrains_track_cr_45.png b/advtrains/textures/advtrains_track_cr_45.png
index 54966b3..54966b3 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_cr_45.png
+++ b/advtrains/textures/advtrains_track_cr_45.png
diff --git a/advtrains/advtrains/textures/advtrains_track_placer.png b/advtrains/textures/advtrains_track_placer.png
index 03e17ed..03e17ed 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_placer.png
+++ b/advtrains/textures/advtrains_track_placer.png
diff --git a/advtrains/advtrains/textures/advtrains_track_st.png b/advtrains/textures/advtrains_track_st.png
index 5ad7e4f..5ad7e4f 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_st.png
+++ b/advtrains/textures/advtrains_track_st.png
diff --git a/advtrains/advtrains/textures/advtrains_track_st_45.png b/advtrains/textures/advtrains_track_st_45.png
index 63b4c96..63b4c96 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_st_45.png
+++ b/advtrains/textures/advtrains_track_st_45.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swlcr.png b/advtrains/textures/advtrains_track_swlcr.png
index d9b5c0b..d9b5c0b 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swlcr.png
+++ b/advtrains/textures/advtrains_track_swlcr.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swlcr_45.png b/advtrains/textures/advtrains_track_swlcr_45.png
index f098fc9..f098fc9 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swlcr_45.png
+++ b/advtrains/textures/advtrains_track_swlcr_45.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swlst.png b/advtrains/textures/advtrains_track_swlst.png
index 314bd2d..314bd2d 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swlst.png
+++ b/advtrains/textures/advtrains_track_swlst.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swlst_45.png b/advtrains/textures/advtrains_track_swlst_45.png
index 765d0ec..765d0ec 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swlst_45.png
+++ b/advtrains/textures/advtrains_track_swlst_45.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swrcr.png b/advtrains/textures/advtrains_track_swrcr.png
index f74e1bc..f74e1bc 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swrcr.png
+++ b/advtrains/textures/advtrains_track_swrcr.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swrcr_45.png b/advtrains/textures/advtrains_track_swrcr_45.png
index fa432aa..fa432aa 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swrcr_45.png
+++ b/advtrains/textures/advtrains_track_swrcr_45.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swrst.png b/advtrains/textures/advtrains_track_swrst.png
index 06ea29e..06ea29e 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swrst.png
+++ b/advtrains/textures/advtrains_track_swrst.png
diff --git a/advtrains/advtrains/textures/advtrains_track_swrst_45.png b/advtrains/textures/advtrains_track_swrst_45.png
index be477b7..be477b7 100644..100755
--- a/advtrains/advtrains/textures/advtrains_track_swrst_45.png
+++ b/advtrains/textures/advtrains_track_swrst_45.png
diff --git a/advtrains/advtrains/textures/advtrains_trackworker.png b/advtrains/textures/advtrains_trackworker.png
index b50bcae..b50bcae 100644..100755
--- a/advtrains/advtrains/textures/advtrains_trackworker.png
+++ b/advtrains/textures/advtrains_trackworker.png
diff --git a/advtrains/advtrains/textures/advtrains_wheel.png b/advtrains/textures/advtrains_wheel.png
index fb72879..fb72879 100644..100755
--- a/advtrains/advtrains/textures/advtrains_wheel.png
+++ b/advtrains/textures/advtrains_wheel.png
diff --git a/advtrains/advtrains/textures/drwho_screwdriver.png b/advtrains/textures/drwho_screwdriver.png
index b50bcae..b50bcae 100644..100755
--- a/advtrains/advtrains/textures/drwho_screwdriver.png
+++ b/advtrains/textures/drwho_screwdriver.png
diff --git a/advtrains/advtrains/trackdb_legacy.lua b/advtrains/trackdb_legacy.lua
index 99349e8..99349e8 100644
--- a/advtrains/advtrains/trackdb_legacy.lua
+++ b/advtrains/trackdb_legacy.lua
diff --git a/advtrains/advtrains/trackplacer.lua b/advtrains/trackplacer.lua
index e94b4ff..e94b4ff 100644
--- a/advtrains/advtrains/trackplacer.lua
+++ b/advtrains/trackplacer.lua
diff --git a/advtrains/advtrains/tracks.lua b/advtrains/tracks.lua
index d63e5c8..d63e5c8 100644
--- a/advtrains/advtrains/tracks.lua
+++ b/advtrains/tracks.lua
diff --git a/advtrains/advtrains/trainhud.lua b/advtrains/trainhud.lua
index 91f54ae..78c7624 100644
--- a/advtrains/advtrains/trainhud.lua
+++ b/advtrains/trainhud.lua
@@ -10,9 +10,10 @@ local mletter={[1]="F", [-1]="R", [0]="N"}
 local doorstr={[-1]="|<>| >|<", [0]=">|< >|<", [1]=">|< |<>|"}
 
 function advtrains.on_control_change(pc, train, flip)
+   	local maxspeed = train.max_speed or 10
 	if pc.sneak then
 		if pc.up then
-			train.tarvelocity = train.max_speed or 10
+			train.tarvelocity = maxspeed
 		end
 		if pc.down then
 			train.tarvelocity = 0
@@ -40,7 +41,7 @@ function advtrains.on_control_change(pc, train, flip)
 		--shift+use:see wagons.lua
 	else
 		if pc.up then
-			train.tarvelocity = train.tarvelocity + 1
+		   train.tarvelocity = math.min(train.tarvelocity + 1, maxspeed)
 		end
 		if pc.down then
 			if train.velocity>0 then
diff --git a/advtrains/advtrains/trainlogic.lua b/advtrains/trainlogic.lua
index 483ea52..d8130e9 100644
--- a/advtrains/advtrains/trainlogic.lua
+++ b/advtrains/trainlogic.lua
@@ -470,7 +470,7 @@ function advtrains.train_step_a(id, train, dtime)
 		
 		local should_check=false
 		for _,p in ipairs(minetest.get_connected_players()) do
-			should_check=should_check or ((vector.distance(ori_pos, p:getpos())<node_range))
+			should_check=should_check or (ori_pos and ((vector.distance(ori_pos, p:getpos())<node_range)))
 		end
 		if should_check then
 			advtrains.update_trainpart_properties(id)
diff --git a/advtrains/advtrains/wagons.lua b/advtrains/wagons.lua
index 567b560..567b560 100644
--- a/advtrains/advtrains/wagons.lua
+++ b/advtrains/wagons.lua
diff --git a/advtrains/advtrains_itrainmap/depends.txt b/advtrains_itrainmap/depends.txt
index 6f00bf6..6f00bf6 100644
--- a/advtrains/advtrains_itrainmap/depends.txt
+++ b/advtrains_itrainmap/depends.txt
diff --git a/advtrains/advtrains_itrainmap/init.lua b/advtrains_itrainmap/init.lua
index 756f1da..756f1da 100644
--- a/advtrains/advtrains_itrainmap/init.lua
+++ b/advtrains_itrainmap/init.lua
diff --git a/advtrains/advtrains_itrainmap/textures/itm_example.png b/advtrains_itrainmap/textures/itm_example.png
index caf084a..caf084a 100644
--- a/advtrains/advtrains_itrainmap/textures/itm_example.png
+++ b/advtrains_itrainmap/textures/itm_example.png
diff --git a/advtrains/advtrains_luaautomation/README.txt b/advtrains_luaautomation/README.txt
index f2219bf..f2219bf 100644
--- a/advtrains/advtrains_luaautomation/README.txt
+++ b/advtrains_luaautomation/README.txt
diff --git a/advtrains/advtrains_luaautomation/active_common.lua b/advtrains_luaautomation/active_common.lua
index 8c910c6..8c910c6 100644
--- a/advtrains/advtrains_luaautomation/active_common.lua
+++ b/advtrains_luaautomation/active_common.lua
diff --git a/advtrains/advtrains_luaautomation/atc_rail.lua b/advtrains_luaautomation/atc_rail.lua
index 3ec82c8..3ec82c8 100644
--- a/advtrains/advtrains_luaautomation/atc_rail.lua
+++ b/advtrains_luaautomation/atc_rail.lua
diff --git a/advtrains/advtrains_luaautomation/chatcmds.lua b/advtrains_luaautomation/chatcmds.lua
index 2d0c69d..2d0c69d 100644
--- a/advtrains/advtrains_luaautomation/chatcmds.lua
+++ b/advtrains_luaautomation/chatcmds.lua
diff --git a/advtrains/advtrains_luaautomation/depends.txt b/advtrains_luaautomation/depends.txt
index 602cf47..602cf47 100644
--- a/advtrains/advtrains_luaautomation/depends.txt
+++ b/advtrains_luaautomation/depends.txt
diff --git a/advtrains/advtrains_luaautomation/environment.lua b/advtrains_luaautomation/environment.lua
index 0b25e87..0b25e87 100644
--- a/advtrains/advtrains_luaautomation/environment.lua
+++ b/advtrains_luaautomation/environment.lua
diff --git a/advtrains/advtrains_luaautomation/init.lua b/advtrains_luaautomation/init.lua
index 0257aef..0257aef 100644
--- a/advtrains/advtrains_luaautomation/init.lua
+++ b/advtrains_luaautomation/init.lua
diff --git a/advtrains/advtrains_luaautomation/interrupt.lua b/advtrains_luaautomation/interrupt.lua
index 718b8c7..718b8c7 100644
--- a/advtrains/advtrains_luaautomation/interrupt.lua
+++ b/advtrains_luaautomation/interrupt.lua
diff --git a/advtrains/advtrains_luaautomation/operation_panel.lua b/advtrains_luaautomation/operation_panel.lua
index 1d585f7..1d585f7 100644
--- a/advtrains/advtrains_luaautomation/operation_panel.lua
+++ b/advtrains_luaautomation/operation_panel.lua
diff --git a/advtrains/advtrains_luaautomation/p_display.lua b/advtrains_luaautomation/p_display.lua
index e69de29..e69de29 100644
--- a/advtrains/advtrains_luaautomation/p_display.lua
+++ b/advtrains_luaautomation/p_display.lua
diff --git a/advtrains/advtrains_luaautomation/p_mesecon_iface.lua b/advtrains_luaautomation/p_mesecon_iface.lua
index 95e5d8a..95e5d8a 100644
--- a/advtrains/advtrains_luaautomation/p_mesecon_iface.lua
+++ b/advtrains_luaautomation/p_mesecon_iface.lua
diff --git a/advtrains/advtrains_luaautomation/passive.lua b/advtrains_luaautomation/passive.lua
index 774df8a..774df8a 100644
--- a/advtrains/advtrains_luaautomation/passive.lua
+++ b/advtrains_luaautomation/passive.lua
diff --git a/advtrains/advtrains_luaautomation/passive_api.txt b/advtrains_luaautomation/passive_api.txt
index a735208..a735208 100644
--- a/advtrains/advtrains_luaautomation/passive_api.txt
+++ b/advtrains_luaautomation/passive_api.txt
diff --git a/advtrains/advtrains_luaautomation/pcnaming.lua b/advtrains_luaautomation/pcnaming.lua
index 56ed2d6..56ed2d6 100644
--- a/advtrains/advtrains_luaautomation/pcnaming.lua
+++ b/advtrains_luaautomation/pcnaming.lua
diff --git a/advtrains/advtrains_luaautomation/textures/atlatc_oppanel.png b/advtrains_luaautomation/textures/atlatc_oppanel.png
index 96eb30e..96eb30e 100644
--- a/advtrains/advtrains_luaautomation/textures/atlatc_oppanel.png
+++ b/advtrains_luaautomation/textures/atlatc_oppanel.png
diff --git a/advtrains/advtrains_luaautomation/textures/atlatc_pcnaming.png b/advtrains_luaautomation/textures/atlatc_pcnaming.png
index 3fccdfc..3fccdfc 100644
--- a/advtrains/advtrains_luaautomation/textures/atlatc_pcnaming.png
+++ b/advtrains_luaautomation/textures/atlatc_pcnaming.png
diff --git a/advtrains/advtrains_train_industrial/depends.txt b/advtrains_train_industrial/depends.txt
index 1fb6665..1fb6665 100644
--- a/advtrains/advtrains_train_industrial/depends.txt
+++ b/advtrains_train_industrial/depends.txt
diff --git a/advtrains/advtrains_train_industrial/init.lua b/advtrains_train_industrial/init.lua
index ebf8d65..ebf8d65 100644
--- a/advtrains/advtrains_train_industrial/init.lua
+++ b/advtrains_train_industrial/init.lua
diff --git a/advtrains/advtrains_train_industrial/locale/de.txt b/advtrains_train_industrial/locale/de.txt
index a45ca27..a45ca27 100644
--- a/advtrains/advtrains_train_industrial/locale/de.txt
+++ b/advtrains_train_industrial/locale/de.txt
diff --git a/advtrains/advtrains_train_industrial/models/advtrains_engine_industrial.b3d b/advtrains_train_industrial/models/advtrains_engine_industrial.b3d
index f1ea485..f1ea485 100644
--- a/advtrains/advtrains_train_industrial/models/advtrains_engine_industrial.b3d
+++ b/advtrains_train_industrial/models/advtrains_engine_industrial.b3d
diff --git a/advtrains/advtrains_train_industrial/models/advtrains_wagon_tank.b3d b/advtrains_train_industrial/models/advtrains_wagon_tank.b3d
index af2604b..af2604b 100644
--- a/advtrains/advtrains_train_industrial/models/advtrains_wagon_tank.b3d
+++ b/advtrains_train_industrial/models/advtrains_wagon_tank.b3d
diff --git a/advtrains/advtrains_train_industrial/models/advtrains_wagon_wood.b3d b/advtrains_train_industrial/models/advtrains_wagon_wood.b3d
index 0e7fb4b..0e7fb4b 100644
--- a/advtrains/advtrains_train_industrial/models/advtrains_wagon_wood.b3d
+++ b/advtrains_train_industrial/models/advtrains_wagon_wood.b3d
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_engine_industrial.png b/advtrains_train_industrial/textures/advtrains_engine_industrial.png
index 38a872f..38a872f 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_engine_industrial.png
+++ b/advtrains_train_industrial/textures/advtrains_engine_industrial.png
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png b/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png
index be4e80f..be4e80f 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_engine_industrial_inv.png
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_tank.png b/advtrains_train_industrial/textures/advtrains_wagon_tank.png
index 79b1316..79b1316 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_tank.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_tank.png
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png b/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png
index 03401be..03401be 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_tank_inv.png
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_wood.png b/advtrains_train_industrial/textures/advtrains_wagon_wood.png
index acc6f72..acc6f72 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_wood.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_wood.png
diff --git a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png b/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png
index 87109dd..87109dd 100644
--- a/advtrains/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png
+++ b/advtrains_train_industrial/textures/advtrains_wagon_wood_inv.png
diff --git a/advtrains/advtrains_train_japan/depends.txt b/advtrains_train_japan/depends.txt
index 1fb6665..1fb6665 100644
--- a/advtrains/advtrains_train_japan/depends.txt
+++ b/advtrains_train_japan/depends.txt
diff --git a/advtrains/advtrains_train_japan/init.lua b/advtrains_train_japan/init.lua
index 8816db3..8816db3 100644
--- a/advtrains/advtrains_train_japan/init.lua
+++ b/advtrains_train_japan/init.lua
diff --git a/advtrains/advtrains_train_japan/locale/de.txt b/advtrains_train_japan/locale/de.txt
index 63d7a97..63d7a97 100644
--- a/advtrains/advtrains_train_japan/locale/de.txt
+++ b/advtrains_train_japan/locale/de.txt
diff --git a/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d b/advtrains_train_japan/models/advtrains_engine_japan.b3d
index 218d965..218d965 100644
--- a/advtrains/advtrains_train_japan/models/advtrains_engine_japan.b3d
+++ b/advtrains_train_japan/models/advtrains_engine_japan.b3d
diff --git a/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d b/advtrains_train_japan/models/advtrains_wagon_japan.b3d
index e6263dd..e6263dd 100644
--- a/advtrains/advtrains_train_japan/models/advtrains_wagon_japan.b3d
+++ b/advtrains_train_japan/models/advtrains_wagon_japan.b3d
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png b/advtrains_train_japan/textures/advtrains_engine_japan.png
index 2bc5fb8..2bc5fb8 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan.png
+++ b/advtrains_train_japan/textures/advtrains_engine_japan.png
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan_inv.png b/advtrains_train_japan/textures/advtrains_engine_japan_inv.png
index 6af0636..6af0636 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_engine_japan_inv.png
+++ b/advtrains_train_japan/textures/advtrains_engine_japan_inv.png
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png b/advtrains_train_japan/textures/advtrains_wagon_japan.png
index c9cddc8..c9cddc8 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan.png
+++ b/advtrains_train_japan/textures/advtrains_wagon_japan.png
diff --git a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png b/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png
index 3e6357c..3e6357c 100644
--- a/advtrains/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png
+++ b/advtrains_train_japan/textures/advtrains_wagon_japan_inv.png
diff --git a/advtrains/advtrains_train_steam/depends.txt b/advtrains_train_steam/depends.txt
index 1fb6665..1fb6665 100644..100755
--- a/advtrains/advtrains_train_steam/depends.txt
+++ b/advtrains_train_steam/depends.txt
diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains_train_steam/init.lua
index 4403f6c..315104a 100644..100755
--- a/advtrains/advtrains_train_steam/init.lua
+++ b/advtrains_train_steam/init.lua
@@ -35,7 +35,7 @@ advtrains.register_wagon("newlocomotive", {
 	},
 	assign_to_seat_group = {"dstand"},
 	visual_size = {x=1, y=1},
-	wagon_span=1.85,
+	wagon_span=2.3,
 	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
 	update_animation=function(self, velocity)
 		if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then
@@ -149,14 +149,14 @@ advtrains.register_wagon("wagon_default", {
 	seats = {
 		{
 			name="1",
-			attach_offset={x=-4, y=8, z=8},
-			view_offset={x=0, y=0, z=0},
+			attach_offset={x=2, y=6, z=8},
+			view_offset={x=0, y=-4, z=0},
 			group="pass",
 		},
 		{
 			name="2",
-			attach_offset={x=4, y=8, z=8},
-			view_offset={x=0, y=0, z=0},
+			attach_offset={x=-1, y=6, z=8},
+			view_offset={x=0, y=-4, z=0},
 			group="pass",
 		},
 		{
@@ -178,20 +178,23 @@ advtrains.register_wagon("wagon_default", {
 			access_to = {},
 		},
 	},
+	
 	assign_to_seat_group = {"pass"},
 	visual_size = {x=1, y=1},
-	wagon_span=3.1,
+	wagon_span=2.634,
 	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
 	drops={"default:steelblock 4"},
 }, S("Passenger Wagon"), "advtrains_wagon_inv.png")
+
+
 advtrains.register_wagon("wagon_box", {
-	mesh="advtrains_wagon.b3d",
+	mesh="advtrains_wagon_box.b3d",
 	textures = {"advtrains_wagon_box.png"},
 	drives_on={default=true},
 	max_speed=10,
 	seats = {},
 	visual_size = {x=1, y=1},
-	wagon_span=1.8,
+	wagon_span=2,
 	collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
 	drops={"default:steelblock 4"},
 	has_inventory = true,
diff --git a/advtrains/advtrains_train_steam/locale/de.txt b/advtrains_train_steam/locale/de.txt
index ac06e20..ac06e20 100644..100755
--- a/advtrains/advtrains_train_steam/locale/de.txt
+++ b/advtrains_train_steam/locale/de.txt
diff --git a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
index 7418d8a..7418d8a 100644..100755
--- a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
+++ b/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
diff --git a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d b/advtrains_train_steam/models/advtrains_engine_steam.b3d
index 6a92f57..6a92f57 100644..100755
--- a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d
+++ b/advtrains_train_steam/models/advtrains_engine_steam.b3d
diff --git a/advtrains_train_steam/models/advtrains_passenger_wagon.b3d b/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
new file mode 100644
index 0000000..2bc01b2
--- /dev/null
+++ b/advtrains_train_steam/models/advtrains_passenger_wagon.b3d
diff --git a/advtrains/advtrains_train_steam/models/advtrains_wagon.b3d b/advtrains_train_steam/models/advtrains_wagon.b3d
index 5c8214c..5c8214c 100644
--- a/advtrains/advtrains_train_steam/models/advtrains_wagon.b3d
+++ b/advtrains_train_steam/models/advtrains_wagon.b3d
diff --git a/advtrains_train_steam/models/advtrains_wagon_box.b3d b/advtrains_train_steam/models/advtrains_wagon_box.b3d
new file mode 100755
index 0000000..914975f
--- /dev/null
+++ b/advtrains_train_steam/models/advtrains_wagon_box.b3d
diff --git a/advtrains_train_steam/screenshot.png b/advtrains_train_steam/screenshot.png
new file mode 100644
index 0000000..089da73
--- /dev/null
+++ b/advtrains_train_steam/screenshot.png
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png b/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
index 51adb5a..51adb5a 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
+++ b/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
index eab4dc8..eab4dc8 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
+++ b/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png b/advtrains_train_steam/textures/advtrains_engine_steam.png
index 4b27e77..4b27e77 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png
+++ b/advtrains_train_steam/textures/advtrains_engine_steam.png
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png b/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
index 8d3fafb..8d3fafb 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
+++ b/advtrains_train_steam/textures/advtrains_engine_steam_inv.png
diff --git a/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains_train_steam/textures/advtrains_wagon.png
new file mode 100644
index 0000000..bd34e68
--- /dev/null
+++ b/advtrains_train_steam/textures/advtrains_wagon.png
diff --git a/advtrains_train_steam/textures/advtrains_wagon_box.png b/advtrains_train_steam/textures/advtrains_wagon_box.png
new file mode 100755
index 0000000..8cdd440
--- /dev/null
+++ b/advtrains_train_steam/textures/advtrains_wagon_box.png
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png b/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
index 480f245..480f245 100644..100755
--- a/advtrains/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
+++ b/advtrains_train_steam/textures/advtrains_wagon_box_inv.png
diff --git a/advtrains_train_steam/textures/advtrains_wagon_inv.png b/advtrains_train_steam/textures/advtrains_wagon_inv.png
new file mode 100755
index 0000000..65f7984
--- /dev/null
+++ b/advtrains_train_steam/textures/advtrains_wagon_inv.png
diff --git a/advtrains/advtrains_train_subway/depends.txt b/advtrains_train_subway/depends.txt
index 1fb6665..1fb6665 100644
--- a/advtrains/advtrains_train_subway/depends.txt
+++ b/advtrains_train_subway/depends.txt
diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua
index 8864e92..8864e92 100644
--- a/advtrains/advtrains_train_subway/init.lua
+++ b/advtrains_train_subway/init.lua
diff --git a/advtrains/advtrains_train_subway/locale/de.txt b/advtrains_train_subway/locale/de.txt
index 4aceebd..4aceebd 100644
--- a/advtrains/advtrains_train_subway/locale/de.txt
+++ b/advtrains_train_subway/locale/de.txt
diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains_train_subway/models/advtrains_subway_wagon.b3d
index cbd0f8e..cbd0f8e 100644
--- a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d
+++ b/advtrains_train_subway/models/advtrains_subway_wagon.b3d
diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains_train_subway/textures/advtrains_subway_wagon.png
index 079d797..079d797 100644
--- a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon.png
diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
index 1d0e809..1d0e809 100644
--- a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
+++ b/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png
diff --git a/advtrains/atc_command.txt b/atc_command.txt
index 3df60c8..3df60c8 100644
--- a/advtrains/atc_command.txt
+++ b/atc_command.txt
diff --git a/description.txt b/description.txt
new file mode 100644
index 0000000..4fa50ae
--- /dev/null
+++ b/description.txt
@@ -0,0 +1 @@
+advtrains 1.3.8
diff --git a/advtrains/license.txt b/license.txt
index 68a4b60..68a4b60 100644
--- a/advtrains/license.txt
+++ b/license.txt
diff --git a/advtrains/license_media.txt b/license_media.txt
index 888cf00..888cf00 100644
--- a/advtrains/license_media.txt
+++ b/license_media.txt
diff --git a/advtrains/manual.pdf b/manual.pdf
index 68691a2..68691a2 100644
--- a/advtrains/manual.pdf
+++ b/manual.pdf
diff --git a/advtrains/readme.txt b/readme.txt
index eaed121..eaed121 100644
--- a/advtrains/readme.txt
+++ b/readme.txt
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000..089da73
--- /dev/null
+++ b/screenshot.png