A little cleanup, some shuffling of the words so that more than one current/upcomming event is in the stack, as opposed to burried under all the words, and added the GenInfo and Venue pointers as appropriate.