small tweak to the 822 parser
Updates to this and that.