[add] correct line numbers where supported, also closes #1