fixed name bug and random crashes