Minor changes overall. Finally fixed login