change on parser and userinput to fit the logic

add some variables