Fix artifact spreading and large scanner. Remove extra list used the mas...

...ter_controller var again.
Ah. I was actually testing a similar change last night, but the spread was looking weird so I gave up and went to sleep.