Added persistent login, fixed limbo
Merge conflicts