Updates to dictionaries. Also reduced default buffer size to 512 chars.