changes in login, selection.
added q