some cleanup and localizations with the Auth