Fixed few bugs, added Passport library