added a bunch of stuff, including AStar