-Fix: make sure to always return the correct thing from ShiftCargo
-Fix: don't let link capacities become 0 when merging
-Codechange: some simplification
-Codechange: finally split things in logical pieces
-Fix: actually save _num_nodes