More A* improvements