Tweak for session changes.
Fix comments on session.
fixed mergeconficts