General revisions & first lines of session class