added location and description to events

and fixed rest of code accordingly