update to Lex parcer syntax and add @ corrects