add the login and small changes