Added validation and fixed some issues with users joining in the waiting stage.