Fixed and imporved TourPIP