add cached data for slow lookups
fix command/patterns