fixed crashes
fixed rejoin