Merged some attendees and fixed a minor documentation error