Improvements
Work on Path
Fixes