session controller improvements