Userlist + fixes