Cleanup & fix path handling