some renaming
Merge remote-tracking branch 'origin'
parser and menu update