Lexer and cup minor modifications

Also changed the error print for the lexical error in the main file