Line number naming fix, code cleanup
new actions event engine