text edited and var's set properly

text edited and var’s set properly