bugs fixed and astar ready