better line number tracking and remove hardcoded paths

[avsm]

Makes it easier for me to work on it without conflicts with your local setup

[pikatchu]

Ok, your changes are integrated ! Many thanks, if you want to change anything else, don't hesitage !