fixed small typos and error of automatic variable rename