Fixed stuff
Added joining a group