change names add event and fix array