Better doc and handling of usernames.