Small fixes - pathfinding broken

Merge broke some connections, everything has been re-linked in the
inspector.

Still working with the pathfinding system to figure out what's best.