fixing a few things in settings, and password reset