Better recursion behavior, better auth sequence, misc improvements