Custom Distances, Tanks, Loads of Fixes.
Resolved merge conflicts