more session fixes + user facing