Added password reset & small fixes