more session bugs fixed