Updates to scanner for terraswarm demo