Tidied up lab2, dijkstras