fixed up and tested astar
Revert "fixed up and tested astar"

This reverts commit d93ff8682dbcd92f8584fc59fb03abfb12360fbc.