added usernames
added name field, and changed id=blah to #blah