Fixed some search/replace mistakes.
Renamed the general versions; added operations counts to dijkstra_heap