2opt should work now, need to be time optimized a lot more though. Made it about 15 times faster by now, not enough though