Fixed modes, added join delay