Added more waits before the ACKs, and fixed a problem with user's not being associated with events