Draft SortOpt; fix dijkstra diagram to use weight