Fixed a login issue, and a couple other minor tweaks