changes in events (not finished)
fixed errors