session fix and more