scanner: updates. parser: ver1