added stuff to whims and events