added haulers, other fixes