- Worked on fixing AStar
merged