Rule concatenation, better Unicode support, revamp of demo lexer