dictionary design fixes