Fixing text after first session
More changes