Add Lexem, some changes in scanner rules