Fixes to includes, commented out passport stuff as it was complicating the base functionality