Straightened out activity waiting and joining a little more