fixed up next_line() stepping and re-add callback code for new event style