change how auth works
auth improved
merged master