Improves dictionaries, functions, tests