Improve line numbering
Improve diff recognition