add stop handling, line numbers to stack (if known)