Changes to spy movement and other misc.
Merge conflicts fix