Fix evac center movement (movements contained within the circle) and ref...

...actoring...