more session tweaks