A* tweaks

Bug finding