adjustments to parsing structures/dict creation