Better "on" event handling

As proposed by kentaromiura a better argument handling of the "on" events is added.
This also fixes previous routing issues. Also contains the "chartat" typo fix.