added users joining, etc. some fixes, some bugs found