* and...more pathfinding cleanup

* more work on research/crafting setup