fixed small things
Merge branch 'refactorsession'

cleaning up some extra stuff