Updating for auth changes (and a few notes)