Some little tweaks to tidy up things a bit. Also added passport as a dependency ready to test next week.