Add support for kind swapping
Fix distance calculation again + more runs