bug fixes
can add new events