Merge pull request #80 from Useful-Innovation/johans-fixes

Some fixes
Fixed sessions
Fixed more sessions
Merge pull request #81 from Useful-Innovation/davids-fixes

Davids fixes