some context improvements

Christian Hergert requested to merge wip/chergert/session into master Aug 11, 2018