Added Dijkstra and fixed problems