fixed login and updated other files