better debugging of session stuff
merge