fixed prev merge; updates to authenticator