pathFinder
bug fixes
merged