Session fixes
Merge pull request #107 from Useful-Innovation/davids-fixes

Session fixes