Improved WayFinder

Improved some functionality