renamed hauler to scavenger
renamed carrier to hauler
changed formatting
simplified role filter