change some names of variables
some tiny changes of variable name and comments
for branch switch
untrack .o files and .model files