fixed all the outstanding path issues