Vars names update + adding new auto comments