minor changes. session manager not done yet