various updates, including those suggested by the antlr ppl