Work on #28(passport) and Fixes #30