Added channel events, fixed stuff