- absolute paths added
- TODOs added