AStar improvements