Add Passport, cleanup a few things