Remove dummy code, add number of users, minor changes