Some Scanner fixes and Lexer new features