Auth fixes, progress on main app