Fixed some issues, but there are still login bugs