fixed things (events/listeners)