Improved path-making/breaking functions
Improved path handling
Improved path handling