Fixes organizer_id and extra end

A few minor changes

Adds reference to users and removes extra end

squashes recent commits