simplified lexer
added advanced ident test
expanded ident definition