Bugfixes and Kruskal