userlist and some cleaning
merged