fixing some unicode bugs. Reintroducing back antlr char stream