Fix: Better debuggability
Fix: Make use of line indication
Fix: simplify call + several minor enhancements