Improved cargo definitions; bugfix for 'heavy' bus gates.