Function and language updates

- update listener functions
- name language file correctly