Pathfinding + small changes