Add $path param for docblock
Fixed potential logical issues
Fix conflicts.