Small fix to address annotations
Small fix to deal with unique usernames
More small tweaks for adding users, displaying profiles.