Few changes

Some changes were made in lex and main