entered vs joined
fixes and changes
various changes