some minor tidying of scavenger lord