Fixes organizer_id and extra end
A few minor changes