Improvements to Path Algo