login and minor changes