Fixes to AStar and Mapper. Still crashes. And in general doesn't work.