add listing users, change email
merge some crap