End shunting properly if the makeup of the completetrain changes (e.g. the end carriage couples with another one during a shunt) + other fixes