slightly more sane session management