Fixed custom event bug and added more details to event