minor change for devise password reset email, and some todo