various fixes and astar integration