A few methods fixes; additon of remember_token field