more lens/parser work