Login

And various other fixes and tweaks