Fix to trim (again)
Doubles for wait time
Add on player join