Working on the session manager and other edits